Refactor census assistant, add unit tests

366 files changed, 7952 insertions, 1091 deletions

diff --git a/.coveralls.yml b/.coveralls.yml
new file mode 100644
index 0000000000..6c68f1d734
--- /dev/null
+++ b/.coveralls.yml
@@ -0,0 +1,5 @@
+src_dir: app
+
+coverage_clover: tests/clover.xml
+
+json_path: tests/coverage-uploade.json
diff --git a/.travis.yml b/.travis.yml
index 8bfca5c74b..e8768b93d8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,19 @@
 language: php
+
 php:
   - 7.0
   - 5.6
   - 5.5
-  - 5.4
-  - 5.3
   - hhvm
+
 sudo: false
+
+before_script:
+  - composer self-update
+  - composer update --no-interaction
+
+script:
+  - phpunit --coverage-clover tests/clover.xml
+
+after_script:
+  - php vendor/bin/coveralls -v
diff --git a/README.md b/README.md
index 56b498701e..57d6cbcbeb 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 [![Latest Stable Version](https://poser.pugx.org/fisharebest/webtrees/v/stable.svg)](https://packagist.org/packages/fisharebest/webtrees)
 [![Build Status](https://travis-ci.org/fisharebest/webtrees.svg?branch=master)](https://travis-ci.org/fisharebest/webtrees)
+[![Coverage Status](https://coveralls.io/repos/fisharebest/webtrees/badge.svg?branch=master&service=github)](https://coveralls.io/github/fisharebest/webtrees?branch=master)
 [![Translation status](http://translate.webtrees.net/widgets/webtrees/-/svg-badge.svg)](http://translate.webtrees.net/engage/webtrees/?utm_source=widget)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/78a5ba19-7ddf-4a58-8262-1c8a149f38de/mini.png)](https://insight.sensiolabs.com/projects/78a5ba19-7ddf-4a58-8262-1c8a149f38de)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/fisharebest/webtrees/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/fisharebest/webtrees/?branch=master)
diff --git a/app/Census/CensusPlace.php b/app/Census/AbstractCensus.php
index fe585f4a50..a195223698 100644
--- a/app/Census/CensusPlace.php
+++ b/app/Census/AbstractCensus.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\Date;
 /**
  * Definitions for a census
  */
-class CensusPlace {
+abstract class AbstractCensus {
 	/**
 	 * @return CensusPlaceInterface[]
 	 */
diff --git a/app/Census/AbstractCensusColumn.php b/app/Census/AbstractCensusColumn.php
index 8c6283e819..6d6710380f 100644
--- a/app/Census/AbstractCensusColumn.php
+++ b/app/Census/AbstractCensusColumn.php
@@ -16,32 +16,38 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census column
  */
 class AbstractCensusColumn {
-	/** @var Individual - the individual recorded on the census */
-	protected $individul;
+	/** @var CensusInterface - the place where the census took place */
+	protected $census;
 
-	/** @var Place - the place where the census took place */
-	protected $place;
+	/**
+	 * Create a column for a census
+	 *
+	 * @param CensusInterface $census
+	 */
+	public function __construct(CensusInterface $census) {
+		$this->census = $census;
+	}
 
-	/** @var Date - the date when the census took place */
-	protected $date;
+	/**
+	 * When did this census occur
+	 *
+	 * @return Date
+	 */
+	public function date() {
+		return new Date($this->census->censusDate());
+	}
 
 	/**
-	 * Create a census column
+	 * Where did this census occur
 	 *
-	 * @param Individual $individual
-	 * @param Place      $place
-	 * @param Date       $date
+	 * @return Date
 	 */
-	public function __construct(Individual $individual, Place $place, Date $date) {
-		$this->individual = $individual;
-		$this->place      = $place;
-		$this->date       = $date;
+	public function place() {
+		return $this->census->censusPlace();
 	}
 }
diff --git a/app/Census/CensusColumnAge.php b/app/Census/CensusColumnAge.php
index a6b80deff4..fbb3554e51 100644
--- a/app/Census/CensusColumnAge.php
+++ b/app/Census/CensusColumnAge.php
@@ -16,7 +16,7 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 
 /**
  * The individual's age.
@@ -25,9 +25,11 @@ class CensusColumnAge extends AbstractCensusColumn implements CensusColumnInterf
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
+	 * @param Individual $individual
+	 *
 	 * @return string
 	 */
-	public function generate() {
-		return Date::getAge($this->individual->getEstimatedBirthDate(), $this->date, 0);
+	public function generate(Individual $individual) {
+		return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
 	}
 }
diff --git a/app/Census/CensusColumnAgeFemale.php b/app/Census/CensusColumnAgeFemale.php
new file mode 100644
index 0000000000..acb5c63b94
--- /dev/null
+++ b/app/Census/CensusColumnAgeFemale.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * The age of a female individual.
+ */
+class CensusColumnAgeFemale extends AbstractCensusColumn implements CensusColumnInterface {
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual) {
+		if ($individual->getSex() === 'M') {
+			return '';
+		} else {
+			return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+		}
+	}
+}
diff --git a/app/Census/CensusColumnAgeFemale5Years.php b/app/Census/CensusColumnAgeFemale5Years.php
new file mode 100644
index 0000000000..b0f6a39800
--- /dev/null
+++ b/app/Census/CensusColumnAgeFemale5Years.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * The age of a female individual (rounded down to the nearest 5 years).
+ */
+class CensusColumnAgeFemale5Years extends AbstractCensusColumn implements CensusColumnInterface {
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual) {
+		if ($individual->getSex() === 'M') {
+			return '';
+		} else {
+			$years = Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+			if ($years > 15) {
+				$years -= $years % 5;
+			}
+
+			return (string) $years;
+		}
+	}
+}
diff --git a/app/Census/CensusColumnAgeMale.php b/app/Census/CensusColumnAgeMale.php
new file mode 100644
index 0000000000..18db4fbbcb
--- /dev/null
+++ b/app/Census/CensusColumnAgeMale.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * The age of a male individual.
+ */
+class CensusColumnAgeMale extends AbstractCensusColumn implements CensusColumnInterface {
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual) {
+		if ($individual->getSex() === 'F') {
+			return '';
+		} else {
+			return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+		}
+	}
+}
diff --git a/app/Census/CensusColumnAgeMale5Years.php b/app/Census/CensusColumnAgeMale5Years.php
new file mode 100644
index 0000000000..4145281b09
--- /dev/null
+++ b/app/Census/CensusColumnAgeMale5Years.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * The age of a male individual (rounded down to the nearest 5 years).
+ */
+class CensusColumnAgeMale5Years extends AbstractCensusColumn implements CensusColumnInterface {
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual) {
+		if ($individual->getSex() === 'F') {
+			return '';
+		} else {
+			$years = Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+			if ($years > 15) {
+				$years -= $years % 5;
+			}
+
+			return (string) $years;
+		}
+	}
+}
diff --git a/app/Census/CensusColumnBornForeignParts.php b/app/Census/CensusColumnBornForeignParts.php
new file mode 100644
index 0000000000..a05883160d
--- /dev/null
+++ b/app/Census/CensusColumnBornForeignParts.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Individual;
+
+/**
+ * Was the individual born in "foreign parts".
+ */
+class CensusColumnBornForeignParts extends AbstractCensusColumn implements CensusColumnInterface {
+	/**
+	 * Generate the likely value of this census column, based on available information.
+	 *
+	 * @param Individual $individual
+	 *
+	 * @return string
+	 */
+	public function generate(Individual $individual) {
+		$birth_place = explode(', ', $individual->getBirthPlace());
+		$birth_place = end($birth_place);
+		$census_place = $this->census->censusPlace();
+
+		if ($birth_place === 'Wales') {
+			$birth_place = 'England';
+		}
+
+		if ($census_place === 'Wales') {
+			$census_place = 'England';
+		}
+
+		if ($birth_place === $census_place) {
+			return '';
+		} elseif ($birth_place === 'England' || $birth_place === 'Scotland' || $birth_place === 'Ireland') {
+			return substr($birth_place, 0, 1);
+		} else {
+			return 'F';
+		}
+	}
+}
diff --git a/app/Census/CensusColumnSexMF.php b/app/Census/CensusColumnBornSameCounty.php
index 7cb7c6e13f..16eccd5871 100644
--- a/app/Census/CensusColumnSexMF.php
+++ b/app/Census/CensusColumnBornSameCounty.php
@@ -15,22 +15,21 @@
  */
 namespace Fisharebest\Webtrees\Census;
 
-use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
 
 /**
- * The individual's sex.
+ * Does the individual live in the county in which they were born.
  */
-class CensusColumnSexMF extends AbstractCensusColumn implements CensusColumnInterface {
+class CensusColumnBornSameCounty extends AbstractCensusColumn implements CensusColumnInterface {
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
+	 * @param Individual $individual
+	 *
 	 * @return string
 	 */
-	public function generate() {
-		if ($this->individual->getSex() === 'U') {
-			return '';
-		} else {
-			return $this->individual->getSex();
-		}
+	public function generate(Individual $individual) {
+		return '';
 	}
 }
diff --git a/app/Census/CensusColumnFullName.php b/app/Census/CensusColumnFullName.php
index 50a2da018a..94ea42de4a 100644
--- a/app/Census/CensusColumnFullName.php
+++ b/app/Census/CensusColumnFullName.php
@@ -13,9 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
 namespace Fisharebest\Webtrees\Census;
 
-use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 
 /**
  * The individual's full name.
@@ -24,9 +25,11 @@ class CensusColumnFullName extends AbstractCensusColumn implements CensusColumnI
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
+	 * @param Individual $individual
+	 *
 	 * @return string
 	 */
-	public function generate() {
-		return strip_tags($this->individual->getFullName());
+	public function generate(Individual $individual) {
+		return $individual->getFullName();
 	}
 }
diff --git a/app/Census/CensusColumnInterface.php b/app/Census/CensusColumnInterface.php
index 9282335ba1..1028af535b 100644
--- a/app/Census/CensusColumnInterface.php
+++ b/app/Census/CensusColumnInterface.php
@@ -15,6 +15,8 @@
  */
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Individual;
+
 /**
  * Definitions for a census column
  */
@@ -22,7 +24,9 @@ interface CensusColumnInterface {
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
+	 * @param Individual $individual
+	 *
 	 * @return string
 	 */
-	public function generate();
+	public function generate(Individual $individual);
 }
diff --git a/app/Census/CensusColumnOccupation.php b/app/Census/CensusColumnOccupation.php
index f18898e127..b4f4711bc7 100644
--- a/app/Census/CensusColumnOccupation.php
+++ b/app/Census/CensusColumnOccupation.php
@@ -15,7 +15,7 @@
  */
 namespace Fisharebest\Webtrees\Census;
 
-use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 
 /**
  * The individual's occupation.
@@ -24,10 +24,12 @@ class CensusColumnOccupation extends AbstractCensusColumn implements CensusColum
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
+	 * @param Individual $individual
+	 *
 	 * @return string
 	 */
-	public function generate() {
-		foreach ($this->individual->getFacts('OCCU') as $fact) {
+	public function generate(Individual $individual) {
+		foreach ($individual->getFacts('OCCU') as $fact) {
 			return $fact->getValue();
 		}
 
diff --git a/app/Census/CensusColumnSameCounty.php b/app/Census/CensusColumnSameCounty.php
index 1026e01f9c..1350c10e8c 100644
--- a/app/Census/CensusColumnSameCounty.php
+++ b/app/Census/CensusColumnSameCounty.php
@@ -16,6 +16,7 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
 
 /**
  * Does the individual live in the county in which they were born.
@@ -24,9 +25,11 @@ class CensusColumnSameCounty extends AbstractCensusColumn implements CensusColum
 	/**
 	 * Generate the likely value of this census column, based on available information.
 	 *
+	 * @param Individual $individual
+	 *
 	 * @return string
 	 */
-	public function generate() {
+	public function generate(Individual $individual) {
 		return '';
 	}
 }
diff --git a/app/Census/CensusInterface.php b/app/Census/CensusInterface.php
index 3f5992ebdf..a0894ae554 100644
--- a/app/Census/CensusInterface.php
+++ b/app/Census/CensusInterface.php
@@ -15,8 +15,6 @@
  */
 namespace Fisharebest\Webtrees\Census;
 
-use Fisharebest\Webtrees\Individual;
-
 /**
  * Definitions for a census
  */
@@ -45,9 +43,7 @@ interface CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual);
+	public function columns();
 }
diff --git a/app/Census/CensusOfDenmark.php b/app/Census/CensusOfDenmark.php
index 01a904cacc..fae70ce164 100644
--- a/app/Census/CensusOfDenmark.php
+++ b/app/Census/CensusOfDenmark.php
@@ -18,7 +18,7 @@ namespace Fisharebest\Webtrees\Census;
 /**
  * Definitions for a census
  */
-class CensusOfDenmark extends CensusPlace implements CensusPlaceInterface {
+class CensusOfDenmark extends AbstractCensus implements CensusPlaceInterface {
 	/**
 	 * All available censuses for this census place.
 	 *
diff --git a/app/Census/CensusOfDenmark1787.php b/app/Census/CensusOfDenmark1787.php
index c1fbd63c86..28df2f5c24 100644
--- a/app/Census/CensusOfDenmark1787.php
+++ b/app/Census/CensusOfDenmark1787.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,14 @@ class CensusOfDenmark1787 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
+			new CensusColumnAgeMale5Years($this),
+			new CensusColumnAgeFemale5Years($this),
+			new CensusColumnOccupation($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1801.php b/app/Census/CensusOfDenmark1801.php
index cfd0dec373..9ba5142aaf 100644
--- a/app/Census/CensusOfDenmark1801.php
+++ b/app/Census/CensusOfDenmark1801.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1801 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1834.php b/app/Census/CensusOfDenmark1834.php
index 2559f41f13..be10e75d5d 100644
--- a/app/Census/CensusOfDenmark1834.php
+++ b/app/Census/CensusOfDenmark1834.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1834 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1840.php b/app/Census/CensusOfDenmark1840.php
index 6f0f518622..ed947af50b 100644
--- a/app/Census/CensusOfDenmark1840.php
+++ b/app/Census/CensusOfDenmark1840.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1840 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1845.php b/app/Census/CensusOfDenmark1845.php
index fe33b8503f..88585f7883 100644
--- a/app/Census/CensusOfDenmark1845.php
+++ b/app/Census/CensusOfDenmark1845.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1845 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1850.php b/app/Census/CensusOfDenmark1850.php
index 4fba7f8952..a99de5d4db 100644
--- a/app/Census/CensusOfDenmark1850.php
+++ b/app/Census/CensusOfDenmark1850.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1850 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1855.php b/app/Census/CensusOfDenmark1855.php
index 8f3fb23b2b..9f47f67ab0 100644
--- a/app/Census/CensusOfDenmark1855.php
+++ b/app/Census/CensusOfDenmark1855.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1855 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1860.php b/app/Census/CensusOfDenmark1860.php
index 752fab04f8..a5ca3bd483 100644
--- a/app/Census/CensusOfDenmark1860.php
+++ b/app/Census/CensusOfDenmark1860.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1860 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1870.php b/app/Census/CensusOfDenmark1870.php
index e560b7e78b..9dab536186 100644
--- a/app/Census/CensusOfDenmark1870.php
+++ b/app/Census/CensusOfDenmark1870.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1870 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1880.php b/app/Census/CensusOfDenmark1880.php
index 944ca9c260..34f4f7e881 100644
--- a/app/Census/CensusOfDenmark1880.php
+++ b/app/Census/CensusOfDenmark1880.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1880 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1890.php b/app/Census/CensusOfDenmark1890.php
index bbb567d675..e10fef4a23 100644
--- a/app/Census/CensusOfDenmark1890.php
+++ b/app/Census/CensusOfDenmark1890.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1890 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1901.php b/app/Census/CensusOfDenmark1901.php
index 2230d4c90d..4e04fb74b0 100644
--- a/app/Census/CensusOfDenmark1901.php
+++ b/app/Census/CensusOfDenmark1901.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1901 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1906.php b/app/Census/CensusOfDenmark1906.php
index 780697689b..09af037ef3 100644
--- a/app/Census/CensusOfDenmark1906.php
+++ b/app/Census/CensusOfDenmark1906.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1906 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1911.php b/app/Census/CensusOfDenmark1911.php
index cc0fcde5b1..12871d5040 100644
--- a/app/Census/CensusOfDenmark1911.php
+++ b/app/Census/CensusOfDenmark1911.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1911 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1916.php b/app/Census/CensusOfDenmark1916.php
index c80e9ce04e..237c71bf41 100644
--- a/app/Census/CensusOfDenmark1916.php
+++ b/app/Census/CensusOfDenmark1916.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1916 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1921.php b/app/Census/CensusOfDenmark1921.php
index 92ce3a3f78..6841512be4 100644
--- a/app/Census/CensusOfDenmark1921.php
+++ b/app/Census/CensusOfDenmark1921.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1921 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1925.php b/app/Census/CensusOfDenmark1925.php
index 66ddd1e914..d780368333 100644
--- a/app/Census/CensusOfDenmark1925.php
+++ b/app/Census/CensusOfDenmark1925.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1925 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfDenmark1930.php b/app/Census/CensusOfDenmark1930.php
index ec266b79cb..9952fd9ce9 100644
--- a/app/Census/CensusOfDenmark1930.php
+++ b/app/Census/CensusOfDenmark1930.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,11 @@ class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfOfEngland.php b/app/Census/CensusOfEngland.php
index 2f74256337..a781d78b6e 100644
--- a/app/Census/CensusOfOfEngland.php
+++ b/app/Census/CensusOfEngland.php
@@ -18,7 +18,7 @@ namespace Fisharebest\Webtrees\Census;
 /**
  * Definitions for a census
  */
-class CensusOfEngland extends CensusPlace implements CensusPlaceInterface {
+class CensusOfEngland extends AbstractCensus implements CensusPlaceInterface {
 	/**
 	 * All available censuses for this census place.
 	 *
diff --git a/app/Census/CensusOfEngland1841.php b/app/Census/CensusOfEngland1841.php
index 567b232bec..b52f3ac737 100644
--- a/app/Census/CensusOfEngland1841.php
+++ b/app/Census/CensusOfEngland1841.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,19 +33,16 @@ class CensusOfEngland1841 extends CensusOfEngland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnAge($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
+			new CensusColumnAgeMale5Years($this),
+			new CensusColumnAgeFemale5Years($this),
+			new CensusColumnOccupation($this),
+			new CensusColumnBornSameCounty($this),
+			new CensusColumnBornForeignParts($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfEngland1851.php b/app/Census/CensusOfEngland1851.php
index b72c695dfc..e6252f07a2 100644
--- a/app/Census/CensusOfEngland1851.php
+++ b/app/Census/CensusOfEngland1851.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -29,22 +27,17 @@ class CensusOfEngland1851 extends CensusOfEngland implements CensusInterface {
 	 * @return string
 	 */
 	public function censusDate() {
-		return '30 FEB 1851';
+		return '30 MAR 1851';
 	}
 
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfEngland1861.php b/app/Census/CensusOfEngland1861.php
index fee49df523..9820be3e63 100644
--- a/app/Census/CensusOfEngland1861.php
+++ b/app/Census/CensusOfEngland1861.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfEngland1861 extends CensusOfEngland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfEngland1871.php b/app/Census/CensusOfEngland1871.php
index 3381f86840..87224bb410 100644
--- a/app/Census/CensusOfEngland1871.php
+++ b/app/Census/CensusOfEngland1871.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfEngland1871 extends CensusOfEngland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfEngland1881.php b/app/Census/CensusOfEngland1881.php
index 1f91258a8b..f40cfe99b8 100644
--- a/app/Census/CensusOfEngland1881.php
+++ b/app/Census/CensusOfEngland1881.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfEngland1881 extends CensusOfEngland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfEngland1891.php b/app/Census/CensusOfEngland1891.php
index fc2e20f20b..a08b19f9da 100644
--- a/app/Census/CensusOfEngland1891.php
+++ b/app/Census/CensusOfEngland1891.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfEngland1891 extends CensusOfEngland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfEngland1901.php b/app/Census/CensusOfEngland1901.php
index 5cca09cbb8..cb7bef729a 100644
--- a/app/Census/CensusOfEngland1901.php
+++ b/app/Census/CensusOfEngland1901.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -29,22 +27,17 @@ class CensusOfEngland1901 extends CensusOfEngland implements CensusInterface {
 	 * @return string
 	 */
 	public function censusDate() {
-		return '31 FEB 1901';
+		return '31 MAR 1901';
 	}
 
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfEngland1911.php b/app/Census/CensusOfEngland1911.php
index 153ae6e9ad..a6759beabc 100644
--- a/app/Census/CensusOfEngland1911.php
+++ b/app/Census/CensusOfEngland1911.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfEngland1911 extends CensusOfEngland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance.php b/app/Census/CensusOfFrance.php
index 0371da088f..8f53e007d4 100644
--- a/app/Census/CensusOfFrance.php
+++ b/app/Census/CensusOfFrance.php
@@ -18,7 +18,7 @@ namespace Fisharebest\Webtrees\Census;
 /**
  * Definitions for a census
  */
-class CensusOfFrance extends CensusPlace implements CensusPlaceInterface {
+class CensusOfFrance extends AbstractCensus implements CensusPlaceInterface {
 	/**
 	 * All available censuses for this census place.
 	 *
diff --git a/app/Census/CensusOfFrance1836.php b/app/Census/CensusOfFrance1836.php
index 48b82c07bd..1e6770841c 100644
--- a/app/Census/CensusOfFrance1836.php
+++ b/app/Census/CensusOfFrance1836.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1836 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1841.php b/app/Census/CensusOfFrance1841.php
index 1e0b0d0ef9..09527a2f7a 100644
--- a/app/Census/CensusOfFrance1841.php
+++ b/app/Census/CensusOfFrance1841.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1841 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1846.php b/app/Census/CensusOfFrance1846.php
index 810c4bad86..45c10146e6 100644
--- a/app/Census/CensusOfFrance1846.php
+++ b/app/Census/CensusOfFrance1846.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1846 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1851.php b/app/Census/CensusOfFrance1851.php
index b707bb2893..86da0cdc0d 100644
--- a/app/Census/CensusOfFrance1851.php
+++ b/app/Census/CensusOfFrance1851.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1851 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1856.php b/app/Census/CensusOfFrance1856.php
index 7f508bcd94..9b12af77b8 100644
--- a/app/Census/CensusOfFrance1856.php
+++ b/app/Census/CensusOfFrance1856.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1856 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1861.php b/app/Census/CensusOfFrance1861.php
index 7bb037b043..77ae9524e1 100644
--- a/app/Census/CensusOfFrance1861.php
+++ b/app/Census/CensusOfFrance1861.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1861 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1866.php b/app/Census/CensusOfFrance1866.php
index 29fa2d5c72..28c54b2cfe 100644
--- a/app/Census/CensusOfFrance1866.php
+++ b/app/Census/CensusOfFrance1866.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1866 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1872.php b/app/Census/CensusOfFrance1872.php
index 80499ad3c1..0c8b6c2fc7 100644
--- a/app/Census/CensusOfFrance1872.php
+++ b/app/Census/CensusOfFrance1872.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1872 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1876.php b/app/Census/CensusOfFrance1876.php
index e1328de228..905a2d4b9e 100644
--- a/app/Census/CensusOfFrance1876.php
+++ b/app/Census/CensusOfFrance1876.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1876 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1881.php b/app/Census/CensusOfFrance1881.php
index cd0fe8c834..8ee588116e 100644
--- a/app/Census/CensusOfFrance1881.php
+++ b/app/Census/CensusOfFrance1881.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1881 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1886.php b/app/Census/CensusOfFrance1886.php
index d39b5c4d8c..c8d72b5509 100644
--- a/app/Census/CensusOfFrance1886.php
+++ b/app/Census/CensusOfFrance1886.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1886 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1891.php b/app/Census/CensusOfFrance1891.php
index 330de94ab1..e0a45ed435 100644
--- a/app/Census/CensusOfFrance1891.php
+++ b/app/Census/CensusOfFrance1891.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1891 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1896.php b/app/Census/CensusOfFrance1896.php
index c34a3af01c..d1738833ab 100644
--- a/app/Census/CensusOfFrance1896.php
+++ b/app/Census/CensusOfFrance1896.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1896 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1901.php b/app/Census/CensusOfFrance1901.php
index f2506256f4..5b7174459b 100644
--- a/app/Census/CensusOfFrance1901.php
+++ b/app/Census/CensusOfFrance1901.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1901 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1906.php b/app/Census/CensusOfFrance1906.php
index 863d477485..5931d1a0ca 100644
--- a/app/Census/CensusOfFrance1906.php
+++ b/app/Census/CensusOfFrance1906.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1906 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfFrance1911.php b/app/Census/CensusOfFrance1911.php
index 84d565294e..4f23c4d3c8 100644
--- a/app/Census/CensusOfFrance1911.php
+++ b/app/Census/CensusOfFrance1911.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfFrance1911 extends CensusOfFrance implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfScotland.php b/app/Census/CensusOfScotland.php
index efe33eeeb6..2c687c8b89 100644
--- a/app/Census/CensusOfScotland.php
+++ b/app/Census/CensusOfScotland.php
@@ -18,7 +18,7 @@ namespace Fisharebest\Webtrees\Census;
 /**
  * Definitions for a census
  */
-class CensusOfScotland extends CensusPlace implements CensusPlaceInterface {
+class CensusOfScotland extends AbstractCensus implements CensusPlaceInterface {
 	/**
 	 * All available censuses for this census place.
 	 *
diff --git a/app/Census/CensusOfScotland1841.php b/app/Census/CensusOfScotland1841.php
index b33f606625..674573a84d 100644
--- a/app/Census/CensusOfScotland1841.php
+++ b/app/Census/CensusOfScotland1841.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,16 @@ class CensusOfScotland1841 extends CensusOfScotland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
+			new CensusColumnAgeMale5Years($this),
+			new CensusColumnAgeFemale5Years($this),
+			new CensusColumnOccupation($this),
+			new CensusColumnBornSameCounty($this),
+			new CensusColumnBornForeignParts($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfScotland1851.php b/app/Census/CensusOfScotland1851.php
index f5edee9714..21b5004cb7 100644
--- a/app/Census/CensusOfScotland1851.php
+++ b/app/Census/CensusOfScotland1851.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -29,22 +27,17 @@ class CensusOfScotland1851 extends CensusOfScotland implements CensusInterface {
 	 * @return string
 	 */
 	public function censusDate() {
-		return '30 FEB 1851';
+		return '30 MAR 1851';
 	}
 
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfScotland1861.php b/app/Census/CensusOfScotland1861.php
index dfd5bb11b6..e5f4b91361 100644
--- a/app/Census/CensusOfScotland1861.php
+++ b/app/Census/CensusOfScotland1861.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfScotland1861 extends CensusOfScotland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfScotland1871.php b/app/Census/CensusOfScotland1871.php
index d5d09df38d..384630dd77 100644
--- a/app/Census/CensusOfScotland1871.php
+++ b/app/Census/CensusOfScotland1871.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfScotland1871 extends CensusOfScotland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfScotland1881.php b/app/Census/CensusOfScotland1881.php
index e9a92d3c9b..d06d43f32b 100644
--- a/app/Census/CensusOfScotland1881.php
+++ b/app/Census/CensusOfScotland1881.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfScotland1881 extends CensusOfScotland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfScotland1891.php b/app/Census/CensusOfScotland1891.php
index 0dc58e986f..d5a6bb1e56 100644
--- a/app/Census/CensusOfScotland1891.php
+++ b/app/Census/CensusOfScotland1891.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfScotland1891 extends CensusOfScotland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfScotland1901.php b/app/Census/CensusOfScotland1901.php
index 4005574c5e..9cb5be63e7 100644
--- a/app/Census/CensusOfScotland1901.php
+++ b/app/Census/CensusOfScotland1901.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -29,22 +27,17 @@ class CensusOfScotland1901 extends CensusOfScotland implements CensusInterface {
 	 * @return string
 	 */
 	public function censusDate() {
-		return '31 FEB 1901';
+		return '31 MAR 1901';
 	}
 
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfScotland1911.php b/app/Census/CensusOfScotland1911.php
index d953405d76..434adb9cc7 100644
--- a/app/Census/CensusOfScotland1911.php
+++ b/app/Census/CensusOfScotland1911.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfScotland1911 extends CensusOfScotland implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates.php b/app/Census/CensusOfUnitedStates.php
index 74491e257f..253a67e84a 100644
--- a/app/Census/CensusOfUnitedStates.php
+++ b/app/Census/CensusOfUnitedStates.php
@@ -18,7 +18,7 @@ namespace Fisharebest\Webtrees\Census;
 /**
  * Definitions for a census
  */
-class CensusOfUnitedStates extends CensusPlace implements CensusPlaceInterface {
+class CensusOfUnitedStates extends AbstractCensus implements CensusPlaceInterface {
 	/**
 	 * All available censuses for this census place.
 	 *
@@ -51,6 +51,6 @@ class CensusOfUnitedStates extends CensusPlace implements CensusPlaceInterface {
 	 * @return string
 	 */
 	public function censusPlace() {
-		return 'Wales';
+		return 'United States';
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1790.php b/app/Census/CensusOfUnitedStates1790.php
index da97f8fd56..0cdb4398ed 100644
--- a/app/Census/CensusOfUnitedStates1790.php
+++ b/app/Census/CensusOfUnitedStates1790.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1790 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1800.php b/app/Census/CensusOfUnitedStates1800.php
index 59072afb76..e1e95b9572 100644
--- a/app/Census/CensusOfUnitedStates1800.php
+++ b/app/Census/CensusOfUnitedStates1800.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1800 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1810.php b/app/Census/CensusOfUnitedStates1810.php
index 8cd8010c2e..453f629b5e 100644
--- a/app/Census/CensusOfUnitedStates1810.php
+++ b/app/Census/CensusOfUnitedStates1810.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1810 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1820.php b/app/Census/CensusOfUnitedStates1820.php
index de8132cc87..f69a1b2463 100644
--- a/app/Census/CensusOfUnitedStates1820.php
+++ b/app/Census/CensusOfUnitedStates1820.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1820 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1830.php b/app/Census/CensusOfUnitedStates1830.php
index d83b65e5bf..81410a06f2 100644
--- a/app/Census/CensusOfUnitedStates1830.php
+++ b/app/Census/CensusOfUnitedStates1830.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1830 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1840.php b/app/Census/CensusOfUnitedStates1840.php
index 6535153ab7..64ea24fd98 100644
--- a/app/Census/CensusOfUnitedStates1840.php
+++ b/app/Census/CensusOfUnitedStates1840.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1840 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1850.php b/app/Census/CensusOfUnitedStates1850.php
index d1d5018c6b..0c17165b5f 100644
--- a/app/Census/CensusOfUnitedStates1850.php
+++ b/app/Census/CensusOfUnitedStates1850.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1850 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1860.php b/app/Census/CensusOfUnitedStates1860.php
index d5b4124f1e..67e0a7220b 100644
--- a/app/Census/CensusOfUnitedStates1860.php
+++ b/app/Census/CensusOfUnitedStates1860.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1860 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1870.php b/app/Census/CensusOfUnitedStates1870.php
index 3648a9c674..79a7b8981d 100644
--- a/app/Census/CensusOfUnitedStates1870.php
+++ b/app/Census/CensusOfUnitedStates1870.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1870 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1880.php b/app/Census/CensusOfUnitedStates1880.php
index 43b8ecab4f..bd576d17e2 100644
--- a/app/Census/CensusOfUnitedStates1880.php
+++ b/app/Census/CensusOfUnitedStates1880.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1880 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1890.php b/app/Census/CensusOfUnitedStates1890.php
index 4e88d7a3a9..9f295dc7fb 100644
--- a/app/Census/CensusOfUnitedStates1890.php
+++ b/app/Census/CensusOfUnitedStates1890.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1890 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1900.php b/app/Census/CensusOfUnitedStates1900.php
index e21c87da99..035c6bbc14 100644
--- a/app/Census/CensusOfUnitedStates1900.php
+++ b/app/Census/CensusOfUnitedStates1900.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1900 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1910.php b/app/Census/CensusOfUnitedStates1910.php
index be8c66b896..ef8d682d2f 100644
--- a/app/Census/CensusOfUnitedStates1910.php
+++ b/app/Census/CensusOfUnitedStates1910.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1910 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1920.php b/app/Census/CensusOfUnitedStates1920.php
index 9b77cbcc02..9e85c9f7c2 100644
--- a/app/Census/CensusOfUnitedStates1920.php
+++ b/app/Census/CensusOfUnitedStates1920.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1920 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1930.php b/app/Census/CensusOfUnitedStates1930.php
index 912466cf8f..7f44c5525f 100644
--- a/app/Census/CensusOfUnitedStates1930.php
+++ b/app/Census/CensusOfUnitedStates1930.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1930 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfUnitedStates1940.php b/app/Census/CensusOfUnitedStates1940.php
index 911606676c..d86a5186bc 100644
--- a/app/Census/CensusOfUnitedStates1940.php
+++ b/app/Census/CensusOfUnitedStates1940.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfUnitedStates1940 extends CensusOfUnitedStates implements CensusInt
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfWales.php b/app/Census/CensusOfWales.php
index b68b483d8d..00453426b7 100644
--- a/app/Census/CensusOfWales.php
+++ b/app/Census/CensusOfWales.php
@@ -18,7 +18,7 @@ namespace Fisharebest\Webtrees\Census;
 /**
  * Definitions for a census
  */
-class CensusOfWales extends CensusPlace implements CensusPlaceInterface {
+class CensusOfWales extends AbstractCensus implements CensusPlaceInterface {
 	/**
 	 * All available censuses for this census place.
 	 *
diff --git a/app/Census/CensusOfWales1841.php b/app/Census/CensusOfWales1841.php
index c43da02742..8f25b5e6da 100644
--- a/app/Census/CensusOfWales1841.php
+++ b/app/Census/CensusOfWales1841.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,18 +33,16 @@ class CensusOfWales1841 extends CensusOfWales implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
-			new CensusColumnSexMF($individual, $place, $date),
-			new CensusColumnOccupation($individual, $place, $date),
+			new CensusColumnFullName($this),
+			new CensusColumnAgeMale5Years($this),
+			new CensusColumnAgeFemale5Years($this),
+			new CensusColumnOccupation($this),
+			new CensusColumnBornSameCounty($this),
+			new CensusColumnBornForeignParts($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfWales1851.php b/app/Census/CensusOfWales1851.php
index d67e65a1f1..0e536b2ee5 100644
--- a/app/Census/CensusOfWales1851.php
+++ b/app/Census/CensusOfWales1851.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -29,22 +27,17 @@ class CensusOfWales1851 extends CensusOfWales implements CensusInterface {
 	 * @return string
 	 */
 	public function censusDate() {
-		return '30 FEB 1851';
+		return '30 MAR 1851';
 	}
 
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfWales1861.php b/app/Census/CensusOfWales1861.php
index cd016c4373..f559ed555d 100644
--- a/app/Census/CensusOfWales1861.php
+++ b/app/Census/CensusOfWales1861.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfWales1861 extends CensusOfWales implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfWales1871.php b/app/Census/CensusOfWales1871.php
index 2a336a2d38..5a244baed9 100644
--- a/app/Census/CensusOfWales1871.php
+++ b/app/Census/CensusOfWales1871.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfWales1871 extends CensusOfWales implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfWales1881.php b/app/Census/CensusOfWales1881.php
index 44f6334902..7c40ce6c2c 100644
--- a/app/Census/CensusOfWales1881.php
+++ b/app/Census/CensusOfWales1881.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfWales1881 extends CensusOfWales implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfWales1891.php b/app/Census/CensusOfWales1891.php
index 29addc0f3e..5182a33280 100644
--- a/app/Census/CensusOfWales1891.php
+++ b/app/Census/CensusOfWales1891.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfWales1891 extends CensusOfWales implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfWales1901.php b/app/Census/CensusOfWales1901.php
index 8339feeb83..2ca36bbd07 100644
--- a/app/Census/CensusOfWales1901.php
+++ b/app/Census/CensusOfWales1901.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -29,22 +27,17 @@ class CensusOfWales1901 extends CensusOfWales implements CensusInterface {
 	 * @return string
 	 */
 	public function censusDate() {
-		return '31 FEB 1901';
+		return '31 MAR 1901';
 	}
 
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/app/Census/CensusOfWales1911.php b/app/Census/CensusOfWales1911.php
index 3ecec5cbba..14b9026ef4 100644
--- a/app/Census/CensusOfWales1911.php
+++ b/app/Census/CensusOfWales1911.php
@@ -16,8 +16,6 @@
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Individual;
-use Fisharebest\Webtrees\Place;
 
 /**
  * Definitions for a census
@@ -35,16 +33,11 @@ class CensusOfWales1911 extends CensusOfWales implements CensusInterface {
 	/**
 	 * The columns of the census.
 	 *
-	 * @param Individual $individual
-	 *
 	 * @return CensusColumnInterface[]
 	 */
-	public function columns(Individual $individual) {
-		$place = new Place($this->censusPlace(), $individual->getTree());
-		$date  = new Date($this->censusDate());
-
+	public function columns() {
 		return array(
-			new CensusColumnFullName($individual, $place, $date),
+			new CensusColumnFullName($this),
 		);
 	}
 }
diff --git a/composer.json b/composer.json
index da281356d3..fb1c452bd4 100644
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,11 @@
 		"ramsey/uuid": "2.*",
 		"tecnick.com/tcpdf": "6.*"
 	},
+	"require-dev": {
+		"mockery/mockery": "*",
+		"phpunit/phpunit": "*",
+		"satooshi/php-coveralls": "dev-master"
+	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "1.8-dev"
diff --git a/composer.lock b/composer.lock
index 729701bcf0..d4dba3f80b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,21 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "04b82f415dff853254bb91505ad80ae1",
+    "hash": "de2a5bf0bce72bf720a62f3f6545afe5",
+    "content-hash": "07f7c8d78a2e5122c991049db2d5e716",
     "packages": [
         {
             "name": "bombayworks/zendframework1",
-            "version": "v1.12.15",
+            "version": "v1.12.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bombayworks/zendframework1.git",
-                "reference": "a9cf9083eda9c2df8ae88b51f83d48347fef9d30"
+                "reference": "0b71c0311a1f5734e14751755aa7f7c4736b2892"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/a9cf9083eda9c2df8ae88b51f83d48347fef9d30",
-                "reference": "a9cf9083eda9c2df8ae88b51f83d48347fef9d30",
+                "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/0b71c0311a1f5734e14751755aa7f7c4736b2892",
+                "reference": "0b71c0311a1f5734e14751755aa7f7c4736b2892",
                 "shasum": ""
             },
             "require": {
@@ -58,7 +59,7 @@
                 "ZF1",
                 "framework"
             ],
-            "time": "2015-08-11 16:00:07"
+            "time": "2015-09-15 16:00:12"
         },
         {
             "name": "ezyang/htmlpurifier",
@@ -152,16 +153,16 @@
         },
         {
             "name": "fisharebest/ext-calendar",
-            "version": "2.1.0",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fisharebest/ext-calendar.git",
-                "reference": "e34274eb932db010369ebe8c76c6b6a6a2ad14c5"
+                "reference": "4ad4547f91073c4266274c5375bcca981e1e98ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fisharebest/ext-calendar/zipball/e34274eb932db010369ebe8c76c6b6a6a2ad14c5",
-                "reference": "e34274eb932db010369ebe8c76c6b6a6a2ad14c5",
+                "url": "https://api.github.com/repos/fisharebest/ext-calendar/zipball/4ad4547f91073c4266274c5375bcca981e1e98ec",
+                "reference": "4ad4547f91073c4266274c5375bcca981e1e98ec",
                 "shasum": ""
             },
             "require": {
@@ -206,7 +207,7 @@
                 "persian",
                 "shamsi"
             ],
-            "time": "2015-04-02 20:40:10"
+            "time": "2015-09-21 15:12:48"
         },
         {
             "name": "fisharebest/localization",
@@ -581,7 +582,1533 @@
             "time": "2015-08-02 12:30:27"
         }
     ],
-    "packages-dev": [],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14 21:17:01"
+        },
+        {
+            "name": "guzzle/guzzle",
+            "version": "v3.9.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle3.git",
+                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9",
+                "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": ">=5.3.3",
+                "symfony/event-dispatcher": "~2.1"
+            },
+            "replace": {
+                "guzzle/batch": "self.version",
+                "guzzle/cache": "self.version",
+                "guzzle/common": "self.version",
+                "guzzle/http": "self.version",
+                "guzzle/inflection": "self.version",
+                "guzzle/iterator": "self.version",
+                "guzzle/log": "self.version",
+                "guzzle/parser": "self.version",
+                "guzzle/plugin": "self.version",
+                "guzzle/plugin-async": "self.version",
+                "guzzle/plugin-backoff": "self.version",
+                "guzzle/plugin-cache": "self.version",
+                "guzzle/plugin-cookie": "self.version",
+                "guzzle/plugin-curlauth": "self.version",
+                "guzzle/plugin-error-response": "self.version",
+                "guzzle/plugin-history": "self.version",
+                "guzzle/plugin-log": "self.version",
+                "guzzle/plugin-md5": "self.version",
+                "guzzle/plugin-mock": "self.version",
+                "guzzle/plugin-oauth": "self.version",
+                "guzzle/service": "self.version",
+                "guzzle/stream": "self.version"
+            },
+            "require-dev": {
+                "doctrine/cache": "~1.3",
+                "monolog/monolog": "~1.0",
+                "phpunit/phpunit": "3.7.*",
+                "psr/log": "~1.0",
+                "symfony/class-loader": "~2.1",
+                "zendframework/zend-cache": "2.*,<2.3",
+                "zendframework/zend-log": "2.*,<2.3"
+            },
+            "suggest": {
+                "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Guzzle": "src/",
+                    "Guzzle\\Tests": "tests/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Guzzle Community",
+                    "homepage": "https://github.com/guzzle/guzzle/contributors"
+                }
+            ],
+            "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2015-03-18 18:23:50"
+        },
+        {
+            "name": "hamcrest/hamcrest-php",
+            "version": "v1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hamcrest/hamcrest-php.git",
+                "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/b37020aa976fa52d3de9aa904aa2522dc518f79c",
+                "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "replace": {
+                "cordoval/hamcrest-php": "*",
+                "davedevelopment/hamcrest-php": "*",
+                "kodova/hamcrest-php": "*"
+            },
+            "require-dev": {
+                "phpunit/php-file-iterator": "1.3.3",
+                "satooshi/php-coveralls": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "hamcrest"
+                ],
+                "files": [
+                    "hamcrest/Hamcrest.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "description": "This is the PHP port of Hamcrest Matchers",
+            "keywords": [
+                "test"
+            ],
+            "time": "2015-05-11 14:41:42"
+        },
+        {
+            "name": "mockery/mockery",
+            "version": "0.9.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/padraic/mockery.git",
+                "reference": "70bba85e4aabc9449626651f48b9018ede04f86b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/padraic/mockery/zipball/70bba85e4aabc9449626651f48b9018ede04f86b",
+                "reference": "70bba85e4aabc9449626651f48b9018ede04f86b",
+                "shasum": ""
+            },
+            "require": {
+                "hamcrest/hamcrest-php": "~1.1",
+                "lib-pcre": ">=7.0",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.9.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Mockery": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Pádraic Brady",
+                    "email": "padraic.brady@gmail.com",
+                    "homepage": "http://blog.astrumfutura.com"
+                },
+                {
+                    "name": "Dave Marshall",
+                    "email": "dave.marshall@atstsolutions.co.uk",
+                    "homepage": "http://davedevelopment.co.uk"
+                }
+            ],
+            "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
+            "homepage": "http://github.com/padraic/mockery",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "library",
+                "mock",
+                "mock objects",
+                "mockery",
+                "stub",
+                "test",
+                "test double",
+                "testing"
+            ],
+            "time": "2015-04-02 19:54:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2015-02-03 12:10:50"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "sebastian/comparator": "~1.1"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2015-08-13 10:07:40"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef1ca6835468857944d5c3b48fa503d5554cff2f",
+                "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-09-14 06:51:16"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2015-06-21 13:08:43"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2015-06-21 08:01:12"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2015-09-15 10:49:45"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.8.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "73fad41adb5b7bc3a494bb930d90648df1d5e74b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/73fad41adb5b7bc3a494bb930d90648df1d5e74b",
+                "reference": "73fad41adb5b7bc3a494bb930d90648df1d5e74b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": ">=1.0.6",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.8.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-09-20 12:56:44"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "5e2645ad49d196e020b85598d7c97e482725786a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5e2645ad49d196e020b85598d7c97e482725786a",
+                "reference": "5e2645ad49d196e020b85598d7c97e482725786a",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-08-19 09:14:08"
+        },
+        {
+            "name": "psr/log",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Psr\\Log\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2012-12-21 11:40:51"
+        },
+        {
+            "name": "satooshi/php-coveralls",
+            "version": "v0.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/satooshi/php-coveralls.git",
+                "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/dd0df95bd37a7cf5c5c50304dfe260ffe4b50760",
+                "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "guzzle/guzzle": ">=3.0",
+                "php": ">=5.3",
+                "psr/log": "1.0.0",
+                "symfony/config": ">=2.0",
+                "symfony/console": ">=2.0",
+                "symfony/stopwatch": ">=2.2",
+                "symfony/yaml": ">=2.0"
+            },
+            "require-dev": {
+                "apigen/apigen": "2.8.*@stable",
+                "pdepend/pdepend": "dev-master",
+                "phpmd/phpmd": "dev-master",
+                "phpunit/php-invoker": ">=1.1.0,<1.2.0",
+                "phpunit/phpunit": "3.7.*@stable",
+                "sebastian/finder-facade": "dev-master",
+                "sebastian/phpcpd": "1.4.*@stable",
+                "squizlabs/php_codesniffer": "1.4.*@stable",
+                "theseer/fdomdocument": "dev-master"
+            },
+            "bin": [
+                "composer/bin/coveralls"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Contrib\\Component": "src/",
+                    "Contrib\\Bundle": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kitamura Satoshi",
+                    "email": "with.no.parachute@gmail.com",
+                    "homepage": "https://www.facebook.com/satooshi.jp"
+                }
+            ],
+            "description": "PHP client library for Coveralls API",
+            "homepage": "https://github.com/satooshi/php-coveralls",
+            "keywords": [
+                "ci",
+                "coverage",
+                "github",
+                "test"
+            ],
+            "time": "2013-05-04 08:07:33"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2015-07-26 15:48:44"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "http://www.github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-02-22 15:13:53"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
+                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2015-08-03 06:14:51"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2015-06-21 07:55:53"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2014-10-06 09:23:50"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
+                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-06-21 08:04:50"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21 13:59:46"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v2.7.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "9698fdf0a750d6887d5e7729d5cf099765b20e61"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/9698fdf0a750d6887d5e7729d5cf099765b20e61",
+                "reference": "9698fdf0a750d6887d5e7729d5cf099765b20e61",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/filesystem": "~2.3"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Config Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-09-21 15:02:29"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v2.7.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "06cb17c013a82f94a3d840682b49425cd00a2161"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/06cb17c013a82f94a3d840682b49425cd00a2161",
+                "reference": "06cb17c013a82f94a3d840682b49425cd00a2161",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1",
+                "symfony/phpunit-bridge": "~2.7",
+                "symfony/process": "~2.1"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-09-25 08:32:23"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v2.7.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
+                "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.0,>=2.0.5",
+                "symfony/dependency-injection": "~2.6",
+                "symfony/expression-language": "~2.6",
+                "symfony/phpunit-bridge": "~2.7",
+                "symfony/stopwatch": "~2.3"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-09-22 13:49:29"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v2.7.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "a17f8a17c20e8614c15b8e116e2f4bcde102cfab"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/a17f8a17c20e8614c15b8e116e2f4bcde102cfab",
+                "reference": "a17f8a17c20e8614c15b8e116e2f4bcde102cfab",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-09-09 17:42:36"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v2.7.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "08dd97b3f22ab9ee658cd16e6758f8c3c404336e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/08dd97b3f22ab9ee658cd16e6758f8c3c404336e",
+                "reference": "08dd97b3f22ab9ee658cd16e6758f8c3c404336e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Stopwatch Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-09-22 13:49:29"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.7.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+                "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.7-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-09-14 14:14:09"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
diff --git a/tests/app/AuthTest.php b/tests/app/AuthTest.php
index 090d7bf04b..9e7ee42aef 100644
--- a/tests/app/AuthTest.php
+++ b/tests/app/AuthTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Auth
  */
-class AuthTest extends PHPUnit_Framework_TestCase {
+class AuthTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
new file mode 100644
index 0000000000..534e390a60
--- /dev/null
+++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnAgeFemale5Years
+ */
+class CensusColumnAgeFemale5YearsTest extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Delete mock objects
+	 */
+	public function tearDown() {
+		Mockery::close();
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testMale() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('M');
+
+		$census = Mockery::mock(CensusInterface::class);
+
+		$column = new CensusColumnAgeFemale5Years($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testFemale() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('F');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
+
+		$column = new CensusColumnAgeFemale5Years($census);
+
+		$this->assertSame('30', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testUnknownSex() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('U');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
+
+		$column = new CensusColumnAgeFemale5Years($census);
+
+		$this->assertSame('30', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testLessThanOneYear() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('F');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
+
+		$column = new CensusColumnAgeFemale5Years($census);
+
+		$this->assertSame('0', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testLessThanFifteenYears() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('F');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1814');
+
+		$column = new CensusColumnAgeFemale5Years($census);
+
+		$this->assertSame('14', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testRoundedDownToFiveYears() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('F');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1844');
+
+		$column = new CensusColumnAgeFemale5Years($census);
+
+		$this->assertSame('40', $column->generate($individual));
+	}
+}
diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php
new file mode 100644
index 0000000000..14c28230cf
--- /dev/null
+++ b/tests/app/Census/CensusColumnAgeFemaleTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnAgeFemale
+ */
+class CensusColumnAgeFemaleTest extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Delete mock objects
+	 */
+	public function tearDown() {
+		Mockery::close();
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testMale() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('M');
+
+		$census = Mockery::mock(CensusInterface::class);
+
+		$column = new CensusColumnAgeFemale($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testFemale() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('F');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
+
+		$column = new CensusColumnAgeFemale($census);
+
+		$this->assertSame('32', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testUnknownSex() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('U');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
+
+		$column = new CensusColumnAgeFemale($census);
+
+		$this->assertSame('32', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeFemale
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testLessThanOneYear() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('F');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
+
+		$column = new CensusColumnAgeFemale($census);
+
+		$this->assertSame('0', $column->generate($individual));
+	}
+}
diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
new file mode 100644
index 0000000000..b0115e409e
--- /dev/null
+++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnAgeMale5Years5Years
+ */
+class CensusColumnAgeMale5YearsTest extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Delete mock objects
+	 */
+	public function tearDown() {
+		Mockery::close();
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testMale() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('M');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
+
+		$column = new CensusColumnAgeMale5Years($census);
+
+		$this->assertSame('30', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testFemale() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('F');
+
+		$census = Mockery::mock(CensusInterface::class);
+
+		$column = new CensusColumnAgeMale5Years($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testUnknownSex() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('U');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
+
+		$column = new CensusColumnAgeMale5Years($census);
+
+		$this->assertSame('30', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testLessThanOneYear() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('M');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
+
+		$column = new CensusColumnAgeMale5Years($census);
+
+		$this->assertSame('0', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testLessThanFifteenYears() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('M');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1814');
+
+		$column = new CensusColumnAgeMale5Years($census);
+
+		$this->assertSame('14', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testRoundedDownToFiveYears() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('M');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1844');
+
+		$column = new CensusColumnAgeMale5Years($census);
+
+		$this->assertSame('40', $column->generate($individual));
+	}
+}
diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php
new file mode 100644
index 0000000000..bd3f275437
--- /dev/null
+++ b/tests/app/Census/CensusColumnAgeMaleTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnAgeMale
+ */
+class CensusColumnAgeMaleTest extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Delete mock objects
+	 */
+	public function tearDown() {
+		Mockery::close();
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testMale() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('M');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
+
+		$column = new CensusColumnAgeMale($census);
+
+		$this->assertSame('32', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testFemale() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('F');
+
+		$census = Mockery::mock(CensusInterface::class);
+
+		$column = new CensusColumnAgeMale($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testUnknownSex() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('U');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
+
+		$column = new CensusColumnAgeMale($census);
+
+		$this->assertSame('32', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnAgeMale
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testLessThanOneYear() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getSex')->andReturn('M');
+		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
+
+		$column = new CensusColumnAgeMale($census);
+
+		$this->assertSame('0', $column->generate($individual));
+	}
+}
diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php
new file mode 100644
index 0000000000..4bc020c0ae
--- /dev/null
+++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php
@@ -0,0 +1,355 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnBornForeignParts
+ */
+class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Delete mock objects
+	 */
+	public function tearDown() {
+		Mockery::close();
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornEnglandCensusEngland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('England');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornWalesCensusEngland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Cardiff, Wales');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('England');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornScotlandCensusEngland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Edinburgh, Scotland');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('England');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('S', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornIrelandCensusEngland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Dublin, Ireland');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('England');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('I', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornForeignCensusEngland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Elbonia');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('England');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('F', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornEnglandCensusIreland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Ireland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('E', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornWalesCensusIreland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Cardiff, Wales');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Ireland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('E', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornScotlandCensusIreland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Edinburgh, Scotland');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Ireland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('S', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornIrelandCensusIreland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Dublin, Ireland');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Ireland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornForeignCensusIreland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Elbonia');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Ireland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('F', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornEnglandCensusScotland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Scotland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('E', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornWalesCensusScotland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Cardiff, Wales');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Scotland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('E', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornScotlandCensusScotland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Edinburgh, Scotland');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Scotland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornIrelandCensusScotland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Dublin, Ireland');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Scotland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('I', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornForeignCensusScotland() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Elbonia');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Scotland');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('F', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornEnglandCensusWales() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Wales');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornWalesCensusWales() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Cardiff, Wales');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Wales');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornScotlandCensusWales() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Edinburgh, Scotland');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Wales');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('S', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornIrelandCensusWales() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Dublin, Ireland');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Wales');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('I', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornForeignParts
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testBornForeignCensusWales() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getBirthPlace')->andReturn('Elbonia');
+
+		$census = Mockery::mock(CensusInterface::class);
+		$census->shouldReceive('censusPlace')->andReturn('Wales');
+
+		$column = new CensusColumnBornForeignParts($census);
+
+		$this->assertSame('F', $column->generate($individual));
+	}
+}
diff --git a/tests/app/Census/CensusColumnBornSameCountyTest.php b/tests/app/Census/CensusColumnBornSameCountyTest.php
new file mode 100644
index 0000000000..f985461a54
--- /dev/null
+++ b/tests/app/Census/CensusColumnBornSameCountyTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnBornSameCounty
+ */
+class CensusColumnBornSameCountyTest extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Delete mock objects
+	 */
+	public function tearDown() {
+		Mockery::close();
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnBornSameCounty
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testDefault() {
+		$individual = Mockery::mock(Individual::class);
+
+		$census = Mockery::mock(CensusInterface::class);
+
+		$column = new CensusColumnBornSameCounty($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+}
diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php
new file mode 100644
index 0000000000..460f2a8b14
--- /dev/null
+++ b/tests/app/Census/CensusColumnFullNameTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnFullName
+ */
+class CensusColumnFullNameTest extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Delete mock objects
+	 */
+	public function tearDown() {
+		Mockery::close();
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnFullName
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testFullName() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getFullName')->andReturn('Joe Bloggs');
+
+		$census = Mockery::mock(CensusInterface::class);
+
+		$column = new CensusColumnFullName($census);
+
+		$this->assertSame('Joe Bloggs', $column->generate($individual));
+	}
+}
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
new file mode 100644
index 0000000000..5852e38012
--- /dev/null
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Individual;
+use Mockery;
+
+/**
+ * Test harness for the class CensusColumnOccupation
+ */
+class CensusColumnOccupationTest extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Delete mock objects
+	 */
+	public function tearDown() {
+		Mockery::close();
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnOccupation
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testNoOccupation() {
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getFacts')->withArgs(['OCCU'])->andReturn([]);
+
+		$census = Mockery::mock(CensusInterface::class);
+
+		$column = new CensusColumnOccupation($census);
+
+		$this->assertSame('', $column->generate($individual));
+	}
+
+	/**
+	 * @covers Fisharebest\Webtrees\Census\CensusColumnOccupation
+	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
+	 */
+	public function testOccupation() {
+		$fact = Mockery::mock(Fact::class);
+		$fact->shouldReceive('getValue')->andReturn('Farmer');
+
+		$individual = Mockery::mock(Individual::class);
+		$individual->shouldReceive('getFacts')->withArgs(['OCCU'])->andReturn([$fact]);
+
+		$census = Mockery::mock(CensusInterface::class);
+
+		$column = new CensusColumnOccupation($census);
+
+		$this->assertSame('Farmer', $column->generate($individual));
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1787Test.php b/tests/app/Census/CensusOfDenmark1787Test.php
new file mode 100644
index 0000000000..7d89a7557d
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1787Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1787
+ */
+class CensusOfDenmark1787Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1787;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 JUL 1787', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1801Test.php b/tests/app/Census/CensusOfDenmark1801Test.php
new file mode 100644
index 0000000000..f6c12c6892
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1801Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1801
+ */
+class CensusOfDenmark1801Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1801;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1801', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1834Test.php b/tests/app/Census/CensusOfDenmark1834Test.php
new file mode 100644
index 0000000000..340f9cd80d
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1834Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1834
+ */
+class CensusOfDenmark1834Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1834;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('18 FEB 1834', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1840Test.php b/tests/app/Census/CensusOfDenmark1840Test.php
new file mode 100644
index 0000000000..5eca2604dc
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1840Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1840
+ */
+class CensusOfDenmark1840Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1840;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1840', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1845Test.php b/tests/app/Census/CensusOfDenmark1845Test.php
new file mode 100644
index 0000000000..59dfc9f58f
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1845Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1845
+ */
+class CensusOfDenmark1845Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1845;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1845', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1850Test.php b/tests/app/Census/CensusOfDenmark1850Test.php
new file mode 100644
index 0000000000..b00ed6cb45
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1850Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1850
+ */
+class CensusOfDenmark1850Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1850;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1850', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1855Test.php b/tests/app/Census/CensusOfDenmark1855Test.php
new file mode 100644
index 0000000000..793f5d77e4
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1855Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1855
+ */
+class CensusOfDenmark1855Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1855;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1855', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1860Test.php b/tests/app/Census/CensusOfDenmark1860Test.php
new file mode 100644
index 0000000000..20a53185ba
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1860Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1860
+ */
+class CensusOfDenmark1860Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1860;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1860', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1870Test.php b/tests/app/Census/CensusOfDenmark1870Test.php
new file mode 100644
index 0000000000..fff0e6e140
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1870Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1870
+ */
+class CensusOfDenmark1870Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1870;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1870', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1880Test.php b/tests/app/Census/CensusOfDenmark1880Test.php
new file mode 100644
index 0000000000..895d1a7bc0
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1880Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1880
+ */
+class CensusOfDenmark1880Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1880;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1880', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1890Test.php b/tests/app/Census/CensusOfDenmark1890Test.php
new file mode 100644
index 0000000000..c522d4753f
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1890Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1890
+ */
+class CensusOfDenmark1890Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1890;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1890', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1901Test.php b/tests/app/Census/CensusOfDenmark1901Test.php
new file mode 100644
index 0000000000..4eb17f00af
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1901Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1901
+ */
+class CensusOfDenmark1901Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1901;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1901', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1906Test.php b/tests/app/Census/CensusOfDenmark1906Test.php
new file mode 100644
index 0000000000..2bffeced58
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1906Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1906
+ */
+class CensusOfDenmark1906Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1906;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1906', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1911Test.php b/tests/app/Census/CensusOfDenmark1911Test.php
new file mode 100644
index 0000000000..491795af69
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1911Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1911
+ */
+class CensusOfDenmark1911Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1911;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1911', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1916Test.php b/tests/app/Census/CensusOfDenmark1916Test.php
new file mode 100644
index 0000000000..c9b9715a44
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1916Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1916
+ */
+class CensusOfDenmark1916Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1916;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1916', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1921Test.php b/tests/app/Census/CensusOfDenmark1921Test.php
new file mode 100644
index 0000000000..3f3e82dc0b
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1921Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1921
+ */
+class CensusOfDenmark1921Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1921;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('01 FEB 1921', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1925Test.php b/tests/app/Census/CensusOfDenmark1925Test.php
new file mode 100644
index 0000000000..d5b9c6e22d
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1925Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1925
+ */
+class CensusOfDenmark1925Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1925;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('05 NOV 1925', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfDenmark1930Test.php b/tests/app/Census/CensusOfDenmark1930Test.php
new file mode 100644
index 0000000000..9f42a0ac28
--- /dev/null
+++ b/tests/app/Census/CensusOfDenmark1930Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfDenmark1930
+ */
+class CensusOfDenmark1930Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfDenmark1930;
+
+		$this->assertSame('Danmark', $census->censusPlace());
+		$this->assertSame('05 NOV 1930', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfEngland1841Test.php b/tests/app/Census/CensusOfEngland1841Test.php
new file mode 100644
index 0000000000..2d2877b09a
--- /dev/null
+++ b/tests/app/Census/CensusOfEngland1841Test.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfEngland1841
+ */
+class CensusOfEngland1841Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfEngland1841;
+
+		$this->assertSame('England', $census->censusPlace());
+		$this->assertSame('06 MAY 1841', $census->censusDate());
+	}
+
+	/**
+	 * Test the census place and date
+	 */
+	public function testColumns() {
+		$census  = new CensusOfEngland1841;
+		$columns = $census->columns();
+
+		$this->assertCount(6, $columns);
+		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+		$this->assertInstanceOf(CensusColumnAgeMale5Years::class, $columns[1]);
+		$this->assertInstanceOf(CensusColumnAgeFemale5Years::class, $columns[2]);
+		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
+		$this->assertInstanceOf(CensusColumnBornSameCounty::class, $columns[4]);
+		$this->assertInstanceOf(CensusColumnBornForeignParts::class, $columns[5]);
+	}
+}
diff --git a/tests/app/Census/CensusOfEngland1851Test.php b/tests/app/Census/CensusOfEngland1851Test.php
new file mode 100644
index 0000000000..8987cd24d0
--- /dev/null
+++ b/tests/app/Census/CensusOfEngland1851Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfEngland1851
+ */
+class CensusOfEngland1851Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfEngland1851;
+
+		$this->assertSame('England', $census->censusPlace());
+		$this->assertSame('30 MAR 1851', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfEngland1861Test.php b/tests/app/Census/CensusOfEngland1861Test.php
new file mode 100644
index 0000000000..9b63284c32
--- /dev/null
+++ b/tests/app/Census/CensusOfEngland1861Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfEngland1861
+ */
+class CensusOfEngland1861Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfEngland1861;
+
+		$this->assertSame('England', $census->censusPlace());
+		$this->assertSame('07 MAR 1861', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfEngland1871Test.php b/tests/app/Census/CensusOfEngland1871Test.php
new file mode 100644
index 0000000000..9fe42bfb7f
--- /dev/null
+++ b/tests/app/Census/CensusOfEngland1871Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfEngland1871
+ */
+class CensusOfEngland1871Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfEngland1871;
+
+		$this->assertSame('England', $census->censusPlace());
+		$this->assertSame('02 MAR 1871', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfEngland1881Test.php b/tests/app/Census/CensusOfEngland1881Test.php
new file mode 100644
index 0000000000..20cf30b53e
--- /dev/null
+++ b/tests/app/Census/CensusOfEngland1881Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfEngland1881
+ */
+class CensusOfEngland1881Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfEngland1881;
+
+		$this->assertSame('England', $census->censusPlace());
+		$this->assertSame('03 MAR 1881', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfEngland1891Test.php b/tests/app/Census/CensusOfEngland1891Test.php
new file mode 100644
index 0000000000..98b9ead58d
--- /dev/null
+++ b/tests/app/Census/CensusOfEngland1891Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfEngland1891
+ */
+class CensusOfEngland1891Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfEngland1891;
+
+		$this->assertSame('England', $census->censusPlace());
+		$this->assertSame('05 MAR 1891', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfEngland1901Test.php b/tests/app/Census/CensusOfEngland1901Test.php
new file mode 100644
index 0000000000..e9a18f9365
--- /dev/null
+++ b/tests/app/Census/CensusOfEngland1901Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfEngland1901
+ */
+class CensusOfEngland1901Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfEngland1901;
+
+		$this->assertSame('England', $census->censusPlace());
+		$this->assertSame('31 MAR 1901', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfEngland1911Test.php b/tests/app/Census/CensusOfEngland1911Test.php
new file mode 100644
index 0000000000..73c4c0c42d
--- /dev/null
+++ b/tests/app/Census/CensusOfEngland1911Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfEngland1911
+ */
+class CensusOfEngland1911Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfEngland1911;
+
+		$this->assertSame('England', $census->censusPlace());
+		$this->assertSame('02 MAR 1911', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1836Test.php b/tests/app/Census/CensusOfFrance1836Test.php
new file mode 100644
index 0000000000..de5598a337
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1836Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1836
+ */
+class CensusOfFrance1836Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1836;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1836', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1841Test.php b/tests/app/Census/CensusOfFrance1841Test.php
new file mode 100644
index 0000000000..14352dd96f
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1841Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1841
+ */
+class CensusOfFrance1841Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1841;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1841', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1846Test.php b/tests/app/Census/CensusOfFrance1846Test.php
new file mode 100644
index 0000000000..b4f1a0b0d3
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1846Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1846
+ */
+class CensusOfFrance1846Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1846;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1846', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1851Test.php b/tests/app/Census/CensusOfFrance1851Test.php
new file mode 100644
index 0000000000..81dc3aa2fd
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1851Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1851
+ */
+class CensusOfFrance1851Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1851;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1851', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1856Test.php b/tests/app/Census/CensusOfFrance1856Test.php
new file mode 100644
index 0000000000..b0d5ff8af3
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1856Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1856
+ */
+class CensusOfFrance1856Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1856;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1856', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1861Test.php b/tests/app/Census/CensusOfFrance1861Test.php
new file mode 100644
index 0000000000..d91b7a20c4
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1861Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1861
+ */
+class CensusOfFrance1861Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1861;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1861', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1866Test.php b/tests/app/Census/CensusOfFrance1866Test.php
new file mode 100644
index 0000000000..f68858cac6
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1866Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1866
+ */
+class CensusOfFrance1866Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1866;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1866', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1872Test.php b/tests/app/Census/CensusOfFrance1872Test.php
new file mode 100644
index 0000000000..096920db1d
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1872Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1872
+ */
+class CensusOfFrance1872Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1872;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1872', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1876Test.php b/tests/app/Census/CensusOfFrance1876Test.php
new file mode 100644
index 0000000000..dd07d7f3ab
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1876Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1876
+ */
+class CensusOfFrance1876Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1876;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1876', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1881Test.php b/tests/app/Census/CensusOfFrance1881Test.php
new file mode 100644
index 0000000000..200939b66b
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1881Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1881
+ */
+class CensusOfFrance1881Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1881;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1881', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1886Test.php b/tests/app/Census/CensusOfFrance1886Test.php
new file mode 100644
index 0000000000..a64e2fb999
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1886Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1886
+ */
+class CensusOfFrance1886Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1886;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1886', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1891Test.php b/tests/app/Census/CensusOfFrance1891Test.php
new file mode 100644
index 0000000000..e63565693e
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1891Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1891
+ */
+class CensusOfFrance1891Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1891;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1891', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1896Test.php b/tests/app/Census/CensusOfFrance1896Test.php
new file mode 100644
index 0000000000..f2aae0b39e
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1896Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1896
+ */
+class CensusOfFrance1896Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1896;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1896', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1901Test.php b/tests/app/Census/CensusOfFrance1901Test.php
new file mode 100644
index 0000000000..237b904c05
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1901Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1901
+ */
+class CensusOfFrance1901Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1901;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1901', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1906Test.php b/tests/app/Census/CensusOfFrance1906Test.php
new file mode 100644
index 0000000000..676838cc35
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1906Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1906
+ */
+class CensusOfFrance1906Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1906;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1906', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfFrance1911Test.php b/tests/app/Census/CensusOfFrance1911Test.php
new file mode 100644
index 0000000000..9a5c149163
--- /dev/null
+++ b/tests/app/Census/CensusOfFrance1911Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfFrance1911
+ */
+class CensusOfFrance1911Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfFrance1911;
+
+		$this->assertSame('France', $census->censusPlace());
+		$this->assertSame('1911', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfScotland1841Test.php b/tests/app/Census/CensusOfScotland1841Test.php
new file mode 100644
index 0000000000..dff476b4ed
--- /dev/null
+++ b/tests/app/Census/CensusOfScotland1841Test.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfScotland1841
+ */
+class CensusOfScotland1841Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfScotland1841;
+
+		$this->assertSame('Scotland', $census->censusPlace());
+		$this->assertSame('06 MAY 1841', $census->censusDate());
+	}
+
+	/**
+	 * Test the census place and date
+	 */
+	public function testColumns() {
+		$census  = new CensusOfScotland1841;
+		$columns = $census->columns();
+
+		$this->assertCount(6, $columns);
+		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+		$this->assertInstanceOf(CensusColumnAgeMale5Years::class, $columns[1]);
+		$this->assertInstanceOf(CensusColumnAgeFemale5Years::class, $columns[2]);
+		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
+		$this->assertInstanceOf(CensusColumnBornSameCounty::class, $columns[4]);
+		$this->assertInstanceOf(CensusColumnBornForeignParts::class, $columns[5]);
+	}
+}
diff --git a/tests/app/Census/CensusOfScotland1851Test.php b/tests/app/Census/CensusOfScotland1851Test.php
new file mode 100644
index 0000000000..d99c807705
--- /dev/null
+++ b/tests/app/Census/CensusOfScotland1851Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfScotland1851
+ */
+class CensusOfScotland1851Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfScotland1851;
+
+		$this->assertSame('Scotland', $census->censusPlace());
+		$this->assertSame('30 MAR 1851', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfScotland1861Test.php b/tests/app/Census/CensusOfScotland1861Test.php
new file mode 100644
index 0000000000..9fc12fd0ec
--- /dev/null
+++ b/tests/app/Census/CensusOfScotland1861Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfScotland1861
+ */
+class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfScotland1861;
+
+		$this->assertSame('Scotland', $census->censusPlace());
+		$this->assertSame('07 MAR 1861', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfScotland1871Test.php b/tests/app/Census/CensusOfScotland1871Test.php
new file mode 100644
index 0000000000..7fecab0542
--- /dev/null
+++ b/tests/app/Census/CensusOfScotland1871Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfScotland1871
+ */
+class CensusOfScotland1871Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfScotland1871;
+
+		$this->assertSame('Scotland', $census->censusPlace());
+		$this->assertSame('02 MAR 1871', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfScotland1881Test.php b/tests/app/Census/CensusOfScotland1881Test.php
new file mode 100644
index 0000000000..c4838c0794
--- /dev/null
+++ b/tests/app/Census/CensusOfScotland1881Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfScotland1881
+ */
+class CensusOfScotland1881Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfScotland1881;
+
+		$this->assertSame('Scotland', $census->censusPlace());
+		$this->assertSame('03 MAR 1881', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfScotland1891Test.php b/tests/app/Census/CensusOfScotland1891Test.php
new file mode 100644
index 0000000000..fe0df796a9
--- /dev/null
+++ b/tests/app/Census/CensusOfScotland1891Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfScotland1891
+ */
+class CensusOfScotland1891Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfScotland1891;
+
+		$this->assertSame('Scotland', $census->censusPlace());
+		$this->assertSame('05 MAR 1891', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfScotland1901Test.php b/tests/app/Census/CensusOfScotland1901Test.php
new file mode 100644
index 0000000000..e90c5f8c19
--- /dev/null
+++ b/tests/app/Census/CensusOfScotland1901Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfScotland1901
+ */
+class CensusOfScotland1901Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfScotland1901;
+
+		$this->assertSame('Scotland', $census->censusPlace());
+		$this->assertSame('31 MAR 1901', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfScotland1911Test.php b/tests/app/Census/CensusOfScotland1911Test.php
new file mode 100644
index 0000000000..9f414bd99f
--- /dev/null
+++ b/tests/app/Census/CensusOfScotland1911Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfScotland1911
+ */
+class CensusOfScotland1911Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfScotland1911;
+
+		$this->assertSame('Scotland', $census->censusPlace());
+		$this->assertSame('02 MAR 1911', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1790Test.php b/tests/app/Census/CensusOfUnitedStates1790Test.php
new file mode 100644
index 0000000000..baf01cd432
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1790Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1790
+ */
+class CensusOfUnitedStates1790Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1790;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('02 AUG 1790', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1800Test.php b/tests/app/Census/CensusOfUnitedStates1800Test.php
new file mode 100644
index 0000000000..99ee9db77d
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1800Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1800
+ */
+class CensusOfUnitedStates1800Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1800;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('04 AUG 1800', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1810Test.php b/tests/app/Census/CensusOfUnitedStates1810Test.php
new file mode 100644
index 0000000000..ce49553dbd
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1810Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1810
+ */
+class CensusOfUnitedStates1810Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1810;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('06 AUG 1810', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1820Test.php b/tests/app/Census/CensusOfUnitedStates1820Test.php
new file mode 100644
index 0000000000..ef6d2ce997
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1820Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1820
+ */
+class CensusOfUnitedStates1820Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1820;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('07 AUG 1820', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1830Test.php b/tests/app/Census/CensusOfUnitedStates1830Test.php
new file mode 100644
index 0000000000..a8ce68ed6e
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1830Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1830
+ */
+class CensusOfUnitedStates1830Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1830;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('01 JUN 1830', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1840Test.php b/tests/app/Census/CensusOfUnitedStates1840Test.php
new file mode 100644
index 0000000000..0a91664210
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1840Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1840
+ */
+class CensusOfUnitedStates1840Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1840;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('01 JUN 1840', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1850Test.php b/tests/app/Census/CensusOfUnitedStates1850Test.php
new file mode 100644
index 0000000000..d36d783a37
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1850Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1850
+ */
+class CensusOfUnitedStates1850Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1850;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('01 JUN 1850', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1860Test.php b/tests/app/Census/CensusOfUnitedStates1860Test.php
new file mode 100644
index 0000000000..7b973136f3
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1860Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1860
+ */
+class CensusOfUnitedStates1860Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1860;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('BET JUN 1860 AND OCT 1860', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1870Test.php b/tests/app/Census/CensusOfUnitedStates1870Test.php
new file mode 100644
index 0000000000..332c6c4e01
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1870Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1870
+ */
+class CensusOfUnitedStates1870Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1870;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('JUN 1870', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1880Test.php b/tests/app/Census/CensusOfUnitedStates1880Test.php
new file mode 100644
index 0000000000..89560fe45b
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1880Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1880
+ */
+class CensusOfUnitedStates1880Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1880;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('JUN 1880', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1890Test.php b/tests/app/Census/CensusOfUnitedStates1890Test.php
new file mode 100644
index 0000000000..db42e13705
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1890Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1890
+ */
+class CensusOfUnitedStates1890Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1890;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('02 JUN 1890', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1900Test.php b/tests/app/Census/CensusOfUnitedStates1900Test.php
new file mode 100644
index 0000000000..f2f14c5cd8
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1900Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1900
+ */
+class CensusOfUnitedStates1900Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1900;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('01 JUN 1900', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1910Test.php b/tests/app/Census/CensusOfUnitedStates1910Test.php
new file mode 100644
index 0000000000..c2dc9504f9
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1910Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1910
+ */
+class CensusOfUnitedStates1910Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1910;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('15 APR 1910', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1920Test.php b/tests/app/Census/CensusOfUnitedStates1920Test.php
new file mode 100644
index 0000000000..fd2e798274
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1920Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1920
+ */
+class CensusOfUnitedStates1920Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1920;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('JAN 1920', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1930Test.php b/tests/app/Census/CensusOfUnitedStates1930Test.php
new file mode 100644
index 0000000000..884317c068
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1930Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1930
+ */
+class CensusOfUnitedStates1930Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1930;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('APR 1930', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfUnitedStates1940Test.php b/tests/app/Census/CensusOfUnitedStates1940Test.php
new file mode 100644
index 0000000000..41b0aca18a
--- /dev/null
+++ b/tests/app/Census/CensusOfUnitedStates1940Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfUnitedStates1940
+ */
+class CensusOfUnitedStates1940Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfUnitedStates1940;
+
+		$this->assertSame('United States', $census->censusPlace());
+		$this->assertSame('01 APR 1940', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfWales1841Test.php b/tests/app/Census/CensusOfWales1841Test.php
new file mode 100644
index 0000000000..4345e4fa2d
--- /dev/null
+++ b/tests/app/Census/CensusOfWales1841Test.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfWales1841
+ */
+class CensusOfWales1841Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfWales1841;
+
+		$this->assertSame('Wales', $census->censusPlace());
+		$this->assertSame('06 MAY 1841', $census->censusDate());
+	}
+
+	/**
+	 * Test the census place and date
+	 */
+	public function testColumns() {
+		$census  = new CensusOfWales1841;
+		$columns = $census->columns();
+
+		$this->assertCount(6, $columns);
+		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
+		$this->assertInstanceOf(CensusColumnAgeMale5Years::class, $columns[1]);
+		$this->assertInstanceOf(CensusColumnAgeFemale5Years::class, $columns[2]);
+		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
+		$this->assertInstanceOf(CensusColumnBornSameCounty::class, $columns[4]);
+		$this->assertInstanceOf(CensusColumnBornForeignParts::class, $columns[5]);
+	}
+}
diff --git a/tests/app/Census/CensusOfWales1851Test.php b/tests/app/Census/CensusOfWales1851Test.php
new file mode 100644
index 0000000000..4f65554e8d
--- /dev/null
+++ b/tests/app/Census/CensusOfWales1851Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfWales1851
+ */
+class CensusOfWales1851Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfWales1851;
+
+		$this->assertSame('Wales', $census->censusPlace());
+		$this->assertSame('30 MAR 1851', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfWales1861Test.php b/tests/app/Census/CensusOfWales1861Test.php
new file mode 100644
index 0000000000..c5a02b1348
--- /dev/null
+++ b/tests/app/Census/CensusOfWales1861Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfWales1861
+ */
+class CensusOfWales1861Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfWales1861;
+
+		$this->assertSame('Wales', $census->censusPlace());
+		$this->assertSame('07 MAR 1861', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfWales1871Test.php b/tests/app/Census/CensusOfWales1871Test.php
new file mode 100644
index 0000000000..80f6ad81e6
--- /dev/null
+++ b/tests/app/Census/CensusOfWales1871Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfWales1871
+ */
+class CensusOfWales1871Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfWales1871;
+
+		$this->assertSame('Wales', $census->censusPlace());
+		$this->assertSame('02 MAR 1871', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfWales1881Test.php b/tests/app/Census/CensusOfWales1881Test.php
new file mode 100644
index 0000000000..515cb215b5
--- /dev/null
+++ b/tests/app/Census/CensusOfWales1881Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfWales1881
+ */
+class CensusOfWales1881Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfWales1881;
+
+		$this->assertSame('Wales', $census->censusPlace());
+		$this->assertSame('03 MAR 1881', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfWales1891Test.php b/tests/app/Census/CensusOfWales1891Test.php
new file mode 100644
index 0000000000..6e260bf9a9
--- /dev/null
+++ b/tests/app/Census/CensusOfWales1891Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfWales1891
+ */
+class CensusOfWales1891Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfWales1891;
+
+		$this->assertSame('Wales', $census->censusPlace());
+		$this->assertSame('05 MAR 1891', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfWales1901Test.php b/tests/app/Census/CensusOfWales1901Test.php
new file mode 100644
index 0000000000..76cd89550d
--- /dev/null
+++ b/tests/app/Census/CensusOfWales1901Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfWales1901
+ */
+class CensusOfWales1901Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfWales1901;
+
+		$this->assertSame('Wales', $census->censusPlace());
+		$this->assertSame('31 MAR 1901', $census->censusDate());
+	}
+}
diff --git a/tests/app/Census/CensusOfWales1911Test.php b/tests/app/Census/CensusOfWales1911Test.php
new file mode 100644
index 0000000000..f3ed211820
--- /dev/null
+++ b/tests/app/Census/CensusOfWales1911Test.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * webtrees: online genealogy
+ * Copyright (C) 2015 webtrees development team
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace Fisharebest\Webtrees\Census;
+
+/**
+ * Test harness for the class CensusOfWales1911
+ */
+class CensusOfWales1911Test extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Test the census place and date
+	 */
+	public function testPlaceAndDate() {
+		$census = new CensusOfWales1911;
+
+		$this->assertSame('Wales', $census->censusPlace());
+		$this->assertSame('02 MAR 1911', $census->censusDate());
+	}
+}
diff --git a/tests/app/Controller/AdvancedSearchControllerTest.php b/tests/app/Controller/AdvancedSearchControllerTest.php
index 15e2a52d8e..1f715d1679 100644
--- a/tests/app/Controller/AdvancedSearchControllerTest.php
+++ b/tests/app/Controller/AdvancedSearchControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class AdvancedSearchController
  */
-class AdvancedSearchControllerTest extends PHPUnit_Framework_TestCase {
+class AdvancedSearchControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/AjaxControllerTest.php b/tests/app/Controller/AjaxControllerTest.php
index edff609b94..2e2d8cb608 100644
--- a/tests/app/Controller/AjaxControllerTest.php
+++ b/tests/app/Controller/AjaxControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class AjaxController
  */
-class AjaxControllerTest extends PHPUnit_Framework_TestCase {
+class AjaxControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/AncestryControllerTest.php b/tests/app/Controller/AncestryControllerTest.php
index a1b73fe158..1cbfd43234 100644
--- a/tests/app/Controller/AncestryControllerTest.php
+++ b/tests/app/Controller/AncestryControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class AncestryController
  */
-class AncestryControllerTest extends PHPUnit_Framework_TestCase {
+class AncestryControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/BaseControllerTest.php b/tests/app/Controller/BaseControllerTest.php
index b874492883..a9631c5e7e 100644
--- a/tests/app/Controller/BaseControllerTest.php
+++ b/tests/app/Controller/BaseControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BaseController
  */
-class BaseControllerTest extends PHPUnit_Framework_TestCase {
+class BaseControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/BranchesControllerTest.php b/tests/app/Controller/BranchesControllerTest.php
index 73c42489d1..e12b297970 100644
--- a/tests/app/Controller/BranchesControllerTest.php
+++ b/tests/app/Controller/BranchesControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BranchesController
  */
-class BranchesControllerTest extends PHPUnit_Framework_TestCase {
+class BranchesControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/ChartControllerTest.php b/tests/app/Controller/ChartControllerTest.php
index ef4e61e473..1204f292f6 100644
--- a/tests/app/Controller/ChartControllerTest.php
+++ b/tests/app/Controller/ChartControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ChartController
  */
-class ChartControllerTest extends PHPUnit_Framework_TestCase {
+class ChartControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/CompactControllerTest.php b/tests/app/Controller/CompactControllerTest.php
index 952fbffad8..c13d148624 100644
--- a/tests/app/Controller/CompactControllerTest.php
+++ b/tests/app/Controller/CompactControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class CompactController
  */
-class CompactControllerTest extends PHPUnit_Framework_TestCase {
+class CompactControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/DescendancyControllerTest.php b/tests/app/Controller/DescendancyControllerTest.php
index d4a56d5cf4..b4e34be6e1 100644
--- a/tests/app/Controller/DescendancyControllerTest.php
+++ b/tests/app/Controller/DescendancyControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class DescendancyController
  */
-class DescendancyControllerTest extends PHPUnit_Framework_TestCase {
+class DescendancyControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/FamilyControllerTest.php b/tests/app/Controller/FamilyControllerTest.php
index d4e2fb1365..c14bda151b 100644
--- a/tests/app/Controller/FamilyControllerTest.php
+++ b/tests/app/Controller/FamilyControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FamilyController
  */
-class FamilyControllerTest extends PHPUnit_Framework_TestCase {
+class FamilyControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/FamilybookControllerTest.php b/tests/app/Controller/FamilybookControllerTest.php
index 1e6d9b104c..79e041069a 100644
--- a/tests/app/Controller/FamilybookControllerTest.php
+++ b/tests/app/Controller/FamilybookControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FamilyBookController
  */
-class FamilybookControllerTest extends PHPUnit_Framework_TestCase {
+class FamilybookControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/FanchartControllerTest.php b/tests/app/Controller/FanchartControllerTest.php
index c5a019a671..ee1930c725 100644
--- a/tests/app/Controller/FanchartControllerTest.php
+++ b/tests/app/Controller/FanchartControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FanchartController
  */
-class FanchartControllerTest extends PHPUnit_Framework_TestCase {
+class FanchartControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/GedcomRecordControllerTest.php b/tests/app/Controller/GedcomRecordControllerTest.php
index a40f19212d..7e031f4844 100644
--- a/tests/app/Controller/GedcomRecordControllerTest.php
+++ b/tests/app/Controller/GedcomRecordControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomRecordController
  */
-class GedcomRecordControllerTest extends PHPUnit_Framework_TestCase {
+class GedcomRecordControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/HourglassControllerTest.php b/tests/app/Controller/HourglassControllerTest.php
index e42c8ae2ba..8a0d2fd8cb 100644
--- a/tests/app/Controller/HourglassControllerTest.php
+++ b/tests/app/Controller/HourglassControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class HourglassController
  */
-class HourglassControllerTest extends PHPUnit_Framework_TestCase {
+class HourglassControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/IndividualControllerTest.php b/tests/app/Controller/IndividualControllerTest.php
index ec56658326..267e9fa959 100644
--- a/tests/app/Controller/IndividualControllerTest.php
+++ b/tests/app/Controller/IndividualControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class IndividualController
  */
-class IndividualControllerTest extends PHPUnit_Framework_TestCase {
+class IndividualControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/LifespanControllerTest.php b/tests/app/Controller/LifespanControllerTest.php
index 39844f29f6..42d3f7bd3a 100644
--- a/tests/app/Controller/LifespanControllerTest.php
+++ b/tests/app/Controller/LifespanControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class LifespanController
  */
-class LifespanControllerTest extends PHPUnit_Framework_TestCase {
+class LifespanControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/MediaControllerTest.php b/tests/app/Controller/MediaControllerTest.php
index 84a185cc96..2bfe03b222 100644
--- a/tests/app/Controller/MediaControllerTest.php
+++ b/tests/app/Controller/MediaControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class MediaController
  */
-class MediaControllerTest extends PHPUnit_Framework_TestCase {
+class MediaControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/NoteControllerTest.php b/tests/app/Controller/NoteControllerTest.php
index 6721caed8d..057f697caa 100644
--- a/tests/app/Controller/NoteControllerTest.php
+++ b/tests/app/Controller/NoteControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class NoteController
  */
-class NoteControllerTest extends PHPUnit_Framework_TestCase {
+class NoteControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/PageControllerTest.php b/tests/app/Controller/PageControllerTest.php
index 0f63a2f32b..76011fe4f4 100644
--- a/tests/app/Controller/PageControllerTest.php
+++ b/tests/app/Controller/PageControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class PageController
  */
-class PageControllerTest extends PHPUnit_Framework_TestCase {
+class PageControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/PedigreeControllerTest.php b/tests/app/Controller/PedigreeControllerTest.php
index eb59f4c245..d0540e888b 100644
--- a/tests/app/Controller/PedigreeControllerTest.php
+++ b/tests/app/Controller/PedigreeControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class PedigreeController
  */
-class PedigreeControllerTest extends PHPUnit_Framework_TestCase {
+class PedigreeControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/RepositoryControllerTest.php b/tests/app/Controller/RepositoryControllerTest.php
index 2454155fd1..dfc8c602f5 100644
--- a/tests/app/Controller/RepositoryControllerTest.php
+++ b/tests/app/Controller/RepositoryControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class RepositoryController
  */
-class RepositoryControllerTest extends PHPUnit_Framework_TestCase {
+class RepositoryControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/SearchControllerTest.php b/tests/app/Controller/SearchControllerTest.php
index 64cbd2fddc..1f9024001e 100644
--- a/tests/app/Controller/SearchControllerTest.php
+++ b/tests/app/Controller/SearchControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class SearchController
  */
-class SearchControllerTest extends PHPUnit_Framework_TestCase {
+class SearchControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/SimpleControllerTest.php b/tests/app/Controller/SimpleControllerTest.php
index 04f144819a..65e9ddfa71 100644
--- a/tests/app/Controller/SimpleControllerTest.php
+++ b/tests/app/Controller/SimpleControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class SimpleController
  */
-class SimpleControllerTest extends PHPUnit_Framework_TestCase {
+class SimpleControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/SourceControllerTest.php b/tests/app/Controller/SourceControllerTest.php
index 45228ec38e..babce7b2a3 100644
--- a/tests/app/Controller/SourceControllerTest.php
+++ b/tests/app/Controller/SourceControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class SourceController
  */
-class SourceControllerTest extends PHPUnit_Framework_TestCase {
+class SourceControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Controller/TimelineControllerTest.php b/tests/app/Controller/TimelineControllerTest.php
index f5d2016c68..42c4278737 100644
--- a/tests/app/Controller/TimelineControllerTest.php
+++ b/tests/app/Controller/TimelineControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class TimelineController
  */
-class TimelineControllerTest extends PHPUnit_Framework_TestCase {
+class TimelineControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/DatabaseTest.php b/tests/app/DatabaseTest.php
index ddc9b05ac4..044b527493 100644
--- a/tests/app/DatabaseTest.php
+++ b/tests/app/DatabaseTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Statement
  */
-class DatabaseTest extends PHPUnit_Framework_TestCase {
+class DatabaseTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Date/CalendarDateTest.php b/tests/app/Date/CalendarDateTest.php
index b2d9dec928..132056630f 100644
--- a/tests/app/Date/CalendarDateTest.php
+++ b/tests/app/Date/CalendarDateTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class CalendarDate
  */
-class CalendarDateTest extends PHPUnit_Framework_TestCase {
+class CalendarDateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Date/FrenchDateTest.php b/tests/app/Date/FrenchDateTest.php
index 8c1e025500..79bb090afc 100644
--- a/tests/app/Date/FrenchDateTest.php
+++ b/tests/app/Date/FrenchDateTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FrenchDate
  */
-class FrenchDateTest extends PHPUnit_Framework_TestCase {
+class FrenchDateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Date/GregorianDateTest.php b/tests/app/Date/GregorianDateTest.php
index f5a22f4960..8d337160e8 100644
--- a/tests/app/Date/GregorianDateTest.php
+++ b/tests/app/Date/GregorianDateTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GregorianDate
  */
-class GregorianDateTest extends PHPUnit_Framework_TestCase {
+class GregorianDateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Date/HijriDateTest.php b/tests/app/Date/HijriDateTest.php
index 6e5585f1ca..21db84406a 100644
--- a/tests/app/Date/HijriDateTest.php
+++ b/tests/app/Date/HijriDateTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class \HijriDate
  */
-class HijriDateTest extends PHPUnit_Framework_TestCase {
+class HijriDateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Date/JalaliDateTest.php b/tests/app/Date/JalaliDateTest.php
index 57be56d60d..95ecad7d43 100644
--- a/tests/app/Date/JalaliDateTest.php
+++ b/tests/app/Date/JalaliDateTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class JalaliDate
  */
-class JalaliDateTest extends PHPUnit_Framework_TestCase {
+class JalaliDateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Date/JewishDateTest.php b/tests/app/Date/JewishDateTest.php
index c73facc8a1..3f90930978 100644
--- a/tests/app/Date/JewishDateTest.php
+++ b/tests/app/Date/JewishDateTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class JewishDate
  */
-class JewishDateTest extends PHPUnit_Framework_TestCase {
+class JewishDateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Date/JulianDateTest.php b/tests/app/Date/JulianDateTest.php
index fb22090121..8bee0781c2 100644
--- a/tests/app/Date/JulianDateTest.php
+++ b/tests/app/Date/JulianDateTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class JulianDate
  */
-class JulianDateTest extends PHPUnit_Framework_TestCase {
+class JulianDateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Date/RomanDateTest.php b/tests/app/Date/RomanDateTest.php
index ada0d0183e..3b853276ba 100644
--- a/tests/app/Date/RomanDateTest.php
+++ b/tests/app/Date/RomanDateTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class RomanDate
  */
-class RomanDateTest extends PHPUnit_Framework_TestCase {
+class RomanDateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/DateTest.php b/tests/app/DateTest.php
index 9025c96ea7..b2afef914a 100644
--- a/tests/app/DateTest.php
+++ b/tests/app/DateTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Date
  */
-class DateTest extends PHPUnit_Framework_TestCase {
+class DateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/FactTest.php b/tests/app/FactTest.php
index 429a8938ab..f095f25158 100644
--- a/tests/app/FactTest.php
+++ b/tests/app/FactTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Fact
  */
-class FactTest extends PHPUnit_Framework_TestCase {
+class FactTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/FamilyTest.php b/tests/app/FamilyTest.php
index b3e6182bef..2f0537ef18 100644
--- a/tests/app/FamilyTest.php
+++ b/tests/app/FamilyTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Family
  */
-class FamilyTest extends PHPUnit_Framework_TestCase {
+class FamilyTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/FileTest.php b/tests/app/FileTest.php
index c1b658f612..e826663c57 100644
--- a/tests/app/FileTest.php
+++ b/tests/app/FileTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class File
  */
-class FileTest extends PHPUnit_Framework_TestCase {
+class FileTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/FilterTest.php b/tests/app/FilterTest.php
index f3bd122375..69453349b9 100644
--- a/tests/app/FilterTest.php
+++ b/tests/app/FilterTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Filter
  */
-class FilterTest extends PHPUnit_Framework_TestCase {
+class FilterTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/FlashMessagesTest.php b/tests/app/FlashMessagesTest.php
index 62ad8f4ab8..f083bc262e 100644
--- a/tests/app/FlashMessagesTest.php
+++ b/tests/app/FlashMessagesTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FlashMessages
  */
-class FlashMessagesTest extends PHPUnit_Framework_TestCase {
+class FlashMessagesTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Functions/FunctionsChartsTest.php b/tests/app/Functions/FunctionsChartsTest.php
index 7a73a863a7..4b48520ae1 100644
--- a/tests/app/Functions/FunctionsChartsTest.php
+++ b/tests/app/Functions/FunctionsChartsTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_charts.php
  */
-class FunctionsChartsTest extends PHPUnit_Framework_TestCase {
+class FunctionsChartsTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsDateTest.php b/tests/app/Functions/FunctionsDateTest.php
index 6d1a2f2331..cd183ac15a 100644
--- a/tests/app/Functions/FunctionsDateTest.php
+++ b/tests/app/Functions/FunctionsDateTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_date.php
  */
-class FunctionsDateTest extends PHPUnit_Framework_TestCase {
+class FunctionsDateTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsDbTest.php b/tests/app/Functions/FunctionsDbTest.php
index 568cebb1b1..c75771c907 100644
--- a/tests/app/Functions/FunctionsDbTest.php
+++ b/tests/app/Functions/FunctionsDbTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_db.php
  */
-class FunctionsDbTest extends PHPUnit_Framework_TestCase {
+class FunctionsDbTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsEditTest.php b/tests/app/Functions/FunctionsEditTest.php
index dc0736cb44..832748ed22 100644
--- a/tests/app/Functions/FunctionsEditTest.php
+++ b/tests/app/Functions/FunctionsEditTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_edit.php
  */
-class FunctionsEditTest extends PHPUnit_Framework_TestCase {
+class FunctionsEditTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsExportTest.php b/tests/app/Functions/FunctionsExportTest.php
index 9f45befc0f..67bfdd23f2 100644
--- a/tests/app/Functions/FunctionsExportTest.php
+++ b/tests/app/Functions/FunctionsExportTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_export.php
  */
-class FunctionsExportTest extends PHPUnit_Framework_TestCase {
+class FunctionsExportTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsImportTest.php b/tests/app/Functions/FunctionsImportTest.php
index 1809f1d551..c723843996 100644
--- a/tests/app/Functions/FunctionsImportTest.php
+++ b/tests/app/Functions/FunctionsImportTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_import.php
  */
-class FunctionsImportTest extends PHPUnit_Framework_TestCase {
+class FunctionsImportTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsMediaTest.php b/tests/app/Functions/FunctionsMediaTest.php
index 3bdc182783..97072f5ffd 100644
--- a/tests/app/Functions/FunctionsMediaTest.php
+++ b/tests/app/Functions/FunctionsMediaTest.php
@@ -19,7 +19,7 @@ use Fisharebest\Webtrees\Functions\FunctionsMedia;
 /**
  * Unit tests for the global functions in the file includes/functions/functions_mediadb.php
  */
-class FunctionsMediaTest extends PHPUnit_Framework_TestCase {
+class FunctionsMediaTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test the function return_bytes().
 	 */
diff --git a/tests/app/Functions/FunctionsPrintFactsTest.php b/tests/app/Functions/FunctionsPrintFactsTest.php
index 0de3f03089..537352372a 100644
--- a/tests/app/Functions/FunctionsPrintFactsTest.php
+++ b/tests/app/Functions/FunctionsPrintFactsTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_print_facts.php
  */
-class FunctionsPrintFactsTest extends PHPUnit_Framework_TestCase {
+class FunctionsPrintFactsTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsPrintListsTest.php b/tests/app/Functions/FunctionsPrintListsTest.php
index 8949264312..29d67814b4 100644
--- a/tests/app/Functions/FunctionsPrintListsTest.php
+++ b/tests/app/Functions/FunctionsPrintListsTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_print_lists.php
  */
-class FunctionsPrintListsTest extends PHPUnit_Framework_TestCase {
+class FunctionsPrintListsTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsPrintTest.php b/tests/app/Functions/FunctionsPrintTest.php
index 4781ccf144..7c14722a7e 100644
--- a/tests/app/Functions/FunctionsPrintTest.php
+++ b/tests/app/Functions/FunctionsPrintTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_print.php
  */
-class FunctionsPrintTest extends PHPUnit_Framework_TestCase {
+class FunctionsPrintTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsRtlTest.php b/tests/app/Functions/FunctionsRtlTest.php
index 379334c1e4..84030c3525 100644
--- a/tests/app/Functions/FunctionsRtlTest.php
+++ b/tests/app/Functions/FunctionsRtlTest.php
@@ -18,7 +18,7 @@
 /**
  * Unit tests for the global functions in the file includes/functions/functions_rtl.php
  */
-class FunctionsRtlTest extends PHPUnit_Framework_TestCase {
+class FunctionsRtlTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Test that the class exists
 	 */
diff --git a/tests/app/Functions/FunctionsTest.php b/tests/app/Functions/FunctionsTest.php
index 6713483e60..b7b19d4c80 100644
--- a/tests/app/Functions/FunctionsTest.php
+++ b/tests/app/Functions/FunctionsTest.php
@@ -19,7 +19,7 @@ use Fisharebest\Webtrees\Functions\Functions;
 /**
  * Unit tests for the global functions in the file includes/functions/functions.php
  */
-class FunctionsTest extends PHPUnit_Framework_TestCase {
+class FunctionsTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Tests for function isFileExternal()
 	 */
diff --git a/tests/app/Gedcom/GedcomCodeAdopTest.php b/tests/app/Gedcom/GedcomCodeAdopTest.php
index 4111448f19..64b7dcd7d3 100644
--- a/tests/app/Gedcom/GedcomCodeAdopTest.php
+++ b/tests/app/Gedcom/GedcomCodeAdopTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomCodeAdop
  */
-class GedcomCodeAdopTest extends PHPUnit_Framework_TestCase {
+class GedcomCodeAdopTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Gedcom/GedcomCodeNameTest.php b/tests/app/Gedcom/GedcomCodeNameTest.php
index 97373ff4b1..402a7c4ccf 100644
--- a/tests/app/Gedcom/GedcomCodeNameTest.php
+++ b/tests/app/Gedcom/GedcomCodeNameTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomCodeName
  */
-class GedcomCodeNameTest extends PHPUnit_Framework_TestCase {
+class GedcomCodeNameTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Gedcom/GedcomCodePediTest.php b/tests/app/Gedcom/GedcomCodePediTest.php
index 7640abe01b..e9b70a5fe3 100644
--- a/tests/app/Gedcom/GedcomCodePediTest.php
+++ b/tests/app/Gedcom/GedcomCodePediTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomCodePedi
  */
-class GedcomCodePediTest extends PHPUnit_Framework_TestCase {
+class GedcomCodePediTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Gedcom/GedcomCodeQuayTest.php b/tests/app/Gedcom/GedcomCodeQuayTest.php
index c11b3f1fa0..b174e1c1f0 100644
--- a/tests/app/Gedcom/GedcomCodeQuayTest.php
+++ b/tests/app/Gedcom/GedcomCodeQuayTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomCodeQuay
  */
-class GedcomCodeQuayTest extends PHPUnit_Framework_TestCase {
+class GedcomCodeQuayTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Gedcom/GedcomCodeRelaTest.php b/tests/app/Gedcom/GedcomCodeRelaTest.php
index 899c1061dc..30342138c6 100644
--- a/tests/app/Gedcom/GedcomCodeRelaTest.php
+++ b/tests/app/Gedcom/GedcomCodeRelaTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomCodeRela
  */
-class GedcomCodeRelaTest extends PHPUnit_Framework_TestCase {
+class GedcomCodeRelaTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Gedcom/GedcomCodeStatTest.php b/tests/app/Gedcom/GedcomCodeStatTest.php
index 89d39e48d9..7f7d74d738 100644
--- a/tests/app/Gedcom/GedcomCodeStatTest.php
+++ b/tests/app/Gedcom/GedcomCodeStatTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomCodeStat
  */
-class GedcomCodeStatTest extends PHPUnit_Framework_TestCase {
+class GedcomCodeStatTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Gedcom/GedcomCodeTempTest.php b/tests/app/Gedcom/GedcomCodeTempTest.php
index 4ceb9bee08..dcb0845065 100644
--- a/tests/app/Gedcom/GedcomCodeTempTest.php
+++ b/tests/app/Gedcom/GedcomCodeTempTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomCodeTemp
  */
-class GedcomCodeTempTest extends PHPUnit_Framework_TestCase {
+class GedcomCodeTempTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/GedcomRecordTest.php b/tests/app/GedcomRecordTest.php
index 46456e1586..e8c0d784e1 100644
--- a/tests/app/GedcomRecordTest.php
+++ b/tests/app/GedcomRecordTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomRecord
  */
-class GedcomRecordTest extends PHPUnit_Framework_TestCase {
+class GedcomRecordTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/GedcomTagTest.php b/tests/app/GedcomTagTest.php
index 80693caa13..1de75fc63f 100644
--- a/tests/app/GedcomTagTest.php
+++ b/tests/app/GedcomTagTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GedcomTag
  */
-class GedcomTagTest extends PHPUnit_Framework_TestCase {
+class GedcomTagTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/I18NTest.php b/tests/app/I18NTest.php
index e058d48342..910a763647 100644
--- a/tests/app/I18NTest.php
+++ b/tests/app/I18NTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\I18N;
 /**
  * Test harness for the class I18N
  */
-class I18NTest extends PHPUnit_Framework_TestCase {
+class I18NTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/IndividualTest.php b/tests/app/IndividualTest.php
index bcb1bb4f16..fea4c2168e 100644
--- a/tests/app/IndividualTest.php
+++ b/tests/app/IndividualTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Individual
  */
-class IndividualTest extends PHPUnit_Framework_TestCase {
+class IndividualTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/LogTest.php b/tests/app/LogTest.php
index 0c3a999472..53551773d0 100644
--- a/tests/app/LogTest.php
+++ b/tests/app/LogTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class WT_Log
  */
-class LogTest extends PHPUnit_Framework_TestCase {
+class LogTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/MailTest.php b/tests/app/MailTest.php
index c883f2f7a3..af105ef58a 100644
--- a/tests/app/MailTest.php
+++ b/tests/app/MailTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Mail
  */
-class MailTest extends PHPUnit_Framework_TestCase {
+class MailTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/MediaTest.php b/tests/app/MediaTest.php
index 5228335946..452d7061c4 100644
--- a/tests/app/MediaTest.php
+++ b/tests/app/MediaTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Media
  */
-class MediaTest extends PHPUnit_Framework_TestCase {
+class MediaTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/MenuTest.php b/tests/app/MenuTest.php
index cc1f452002..10b7d1f7b7 100644
--- a/tests/app/MenuTest.php
+++ b/tests/app/MenuTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\Menu;
 /**
  * Test harness for the class Menu
  */
-class MenuTest extends PHPUnit_Framework_TestCase {
+class MenuTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests.
 	 */
diff --git a/tests/app/Module/AhnentafelReportModuleTest.php b/tests/app/Module/AhnentafelReportModuleTest.php
index b6c2f6f8f7..c4080b79bc 100644
--- a/tests/app/Module/AhnentafelReportModuleTest.php
+++ b/tests/app/Module/AhnentafelReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class AhnentafelReportModule
  */
-class AhnentafelReportModuleTest extends PHPUnit_Framework_TestCase {
+class AhnentafelReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/AlbumModuleTest.php b/tests/app/Module/AlbumModuleTest.php
index 7ea884f68e..000050945e 100644
--- a/tests/app/Module/AlbumModuleTest.php
+++ b/tests/app/Module/AlbumModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class AlbumModule
  */
-class AlbumModuleTest extends PHPUnit_Framework_TestCase {
+class AlbumModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateBasePluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateBasePluginTest.php
index 5e2a21f5a4..5cead29249 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateBasePluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateBasePluginTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BatchUpdateBasePlugin
  */
-class BatchUpdateBasePluginTest extends PHPUnit_Framework_TestCase {
+class BatchUpdateBasePluginTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateDuplicateLinksPluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateDuplicateLinksPluginTest.php
index e24a752589..a308d179c4 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateDuplicateLinksPluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateDuplicateLinksPluginTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BatchUpdateDuplicateLinksPlugin
  */
-class BatchUpdateDuplicateLinksPluginTest extends PHPUnit_Framework_TestCase {
+class BatchUpdateDuplicateLinksPluginTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateMarriedNamesPluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateMarriedNamesPluginTest.php
index 6ed7da37c7..926eabe3af 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateMarriedNamesPluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateMarriedNamesPluginTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BatchUpdateMarriedNamesPlugin
  */
-class BatchUpdateMarriedNamesPluginTest extends PHPUnit_Framework_TestCase {
+class BatchUpdateMarriedNamesPluginTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateMissingDeathPluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateMissingDeathPluginTest.php
index 26988646dc..3bb0f76550 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateMissingDeathPluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateMissingDeathPluginTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BatchUpdateMissingDeathPlugin
  */
-class BatchUpdateMissingDeathPluginTest extends PHPUnit_Framework_TestCase {
+class BatchUpdateMissingDeathPluginTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateNameFormatPluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateNameFormatPluginTest.php
index 27624e0e64..d72a06d06c 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateNameFormatPluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateNameFormatPluginTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BatchUpdateNameFormatPlugin
  */
-class BatchUpdateNameFormatPluginTest extends PHPUnit_Framework_TestCase {
+class BatchUpdateNameFormatPluginTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/BatchUpdate/BatchUpdateSearchReplacePluginTest.php b/tests/app/Module/BatchUpdate/BatchUpdateSearchReplacePluginTest.php
index 2a99cea59b..da00e03411 100644
--- a/tests/app/Module/BatchUpdate/BatchUpdateSearchReplacePluginTest.php
+++ b/tests/app/Module/BatchUpdate/BatchUpdateSearchReplacePluginTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BatchUpdateSearchReplacePlugin
  */
-class BatchUpdateSearchReplacePluginTest extends PHPUnit_Framework_TestCase {
+class BatchUpdateSearchReplacePluginTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/BatchUpdateModuleTest.php b/tests/app/Module/BatchUpdateModuleTest.php
index 4860800d9b..e8e8a66553 100644
--- a/tests/app/Module/BatchUpdateModuleTest.php
+++ b/tests/app/Module/BatchUpdateModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BatchUpdateModule
  */
-class BatchUpdateModuleTest extends PHPUnit_Framework_TestCase {
+class BatchUpdateModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/BirthDeathMarriageReportModuleTest.php b/tests/app/Module/BirthDeathMarriageReportModuleTest.php
index d25d067586..1314acc944 100644
--- a/tests/app/Module/BirthDeathMarriageReportModuleTest.php
+++ b/tests/app/Module/BirthDeathMarriageReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BirthDeathMarriageReportModule
  */
-class BirthDeathMarriageReportModuleTest extends PHPUnit_Framework_TestCase {
+class BirthDeathMarriageReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/BirthReportModuleTest.php b/tests/app/Module/BirthReportModuleTest.php
index 660684e99e..ee017087c0 100644
--- a/tests/app/Module/BirthReportModuleTest.php
+++ b/tests/app/Module/BirthReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class BirthReportModule
  */
-class BirthReportModuleTest extends PHPUnit_Framework_TestCase {
+class BirthReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/CemeteryReportModuleTest.php b/tests/app/Module/CemeteryReportModuleTest.php
index 15f5ee0c45..da7971f2d6 100644
--- a/tests/app/Module/CemeteryReportModuleTest.php
+++ b/tests/app/Module/CemeteryReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class CemeteryReportModule
  */
-class CemeteryReportModuleTest extends PHPUnit_Framework_TestCase {
+class CemeteryReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/CensusAssistantModuleTest.php b/tests/app/Module/CensusAssistantModuleTest.php
index 7ac3d9edb3..aec3c5de92 100644
--- a/tests/app/Module/CensusAssistantModuleTest.php
+++ b/tests/app/Module/CensusAssistantModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class CensusAssistantModule
  */
-class CensusAssistantModuleTest extends PHPUnit_Framework_TestCase {
+class CensusAssistantModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ChangeReportModuleTest.php b/tests/app/Module/ChangeReportModuleTest.php
index ea6e9ef92d..141a7d71fb 100644
--- a/tests/app/Module/ChangeReportModuleTest.php
+++ b/tests/app/Module/ChangeReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ChangeReportModule
  */
-class ChangeReportModuleTest extends PHPUnit_Framework_TestCase {
+class ChangeReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ChartsBlockModuleTest.php b/tests/app/Module/ChartsBlockModuleTest.php
index 0edadd0aa9..8e7128d586 100644
--- a/tests/app/Module/ChartsBlockModuleTest.php
+++ b/tests/app/Module/ChartsBlockModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ChartsBlockModule
  */
-class ChartsBlockModuleTest extends PHPUnit_Framework_TestCase {
+class ChartsBlockModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/CkeditorModuleTest.php b/tests/app/Module/CkeditorModuleTest.php
index 3366a0b364..e87a6e8934 100644
--- a/tests/app/Module/CkeditorModuleTest.php
+++ b/tests/app/Module/CkeditorModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class CkeditorModule
  */
-class CkeditorModuleTest extends PHPUnit_Framework_TestCase {
+class CkeditorModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ClippingsCart/ClippingsCartControllerTest.php b/tests/app/Module/ClippingsCart/ClippingsCartControllerTest.php
index ced778f195..f3342bee94 100644
--- a/tests/app/Module/ClippingsCart/ClippingsCartControllerTest.php
+++ b/tests/app/Module/ClippingsCart/ClippingsCartControllerTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ClippingsCartController
  */
-class ClippingsCartControllerTest extends PHPUnit_Framework_TestCase {
+class ClippingsCartControllerTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ClippingsCartModuleTest.php b/tests/app/Module/ClippingsCartModuleTest.php
index 97f4418d8d..55d7ce73a5 100644
--- a/tests/app/Module/ClippingsCartModuleTest.php
+++ b/tests/app/Module/ClippingsCartModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ClippingsCartModule
  */
-class ClippingsCartModuleTest extends PHPUnit_Framework_TestCase {
+class ClippingsCartModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/DeathReportModuleTest.php b/tests/app/Module/DeathReportModuleTest.php
index 7e2256a8f6..e5502eb825 100644
--- a/tests/app/Module/DeathReportModuleTest.php
+++ b/tests/app/Module/DeathReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class DeathReportModule
  */
-class DeathReportModuleTest extends PHPUnit_Framework_TestCase {
+class DeathReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/DescendancyModuleTest.php b/tests/app/Module/DescendancyModuleTest.php
index 6f6ea16274..cdc41df32b 100644
--- a/tests/app/Module/DescendancyModuleTest.php
+++ b/tests/app/Module/DescendancyModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class DescendancyModule
  */
-class DescendancyModuleTest extends PHPUnit_Framework_TestCase {
+class DescendancyModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/DescendancyReportModuleTest.php b/tests/app/Module/DescendancyReportModuleTest.php
index 5794daced4..da616b5888 100644
--- a/tests/app/Module/DescendancyReportModuleTest.php
+++ b/tests/app/Module/DescendancyReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class DescendancyReportModule
  */
-class DescendancyReportModuleTest extends PHPUnit_Framework_TestCase {
+class DescendancyReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ExtraInformationModuleTest.php b/tests/app/Module/ExtraInformationModuleTest.php
index d915452c50..ddf0e74185 100644
--- a/tests/app/Module/ExtraInformationModuleTest.php
+++ b/tests/app/Module/ExtraInformationModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ExtraInformationModule
  */
-class ExtraInformationModuleTest extends PHPUnit_Framework_TestCase {
+class ExtraInformationModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/FactSourcesReportModuleTest.php b/tests/app/Module/FactSourcesReportModuleTest.php
index 6b1bf88dcb..c96607833d 100644
--- a/tests/app/Module/FactSourcesReportModuleTest.php
+++ b/tests/app/Module/FactSourcesReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FactSourcesReportModule
  */
-class FactSourcesReportModuleTest extends PHPUnit_Framework_TestCase {
+class FactSourcesReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/FamiliesSidebarModuleTest.php b/tests/app/Module/FamiliesSidebarModuleTest.php
index 14b5fa0d03..ad9da3534e 100644
--- a/tests/app/Module/FamiliesSidebarModuleTest.php
+++ b/tests/app/Module/FamiliesSidebarModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FamiliesSidebarModule
  */
-class FamiliesSidebarModuleTest extends PHPUnit_Framework_TestCase {
+class FamiliesSidebarModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/FamilyGroupReportModuleTest.php b/tests/app/Module/FamilyGroupReportModuleTest.php
index 21b0a30b5b..80ae272285 100644
--- a/tests/app/Module/FamilyGroupReportModuleTest.php
+++ b/tests/app/Module/FamilyGroupReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FamilyGroupReportModule
  */
-class FamilyGroupReportModuleTest extends PHPUnit_Framework_TestCase {
+class FamilyGroupReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/FamilyNavigatorModuleTest.php b/tests/app/Module/FamilyNavigatorModuleTest.php
index ee2cdc69b5..f29b527a33 100644
--- a/tests/app/Module/FamilyNavigatorModuleTest.php
+++ b/tests/app/Module/FamilyNavigatorModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FamilyNavigatorModule
  */
-class FamilyNavigatorModuleTest extends PHPUnit_Framework_TestCase {
+class FamilyNavigatorModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/FamilyTreeFavoritesModuleTest.php b/tests/app/Module/FamilyTreeFavoritesModuleTest.php
index 74a1f074f2..b9960695c3 100644
--- a/tests/app/Module/FamilyTreeFavoritesModuleTest.php
+++ b/tests/app/Module/FamilyTreeFavoritesModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FamilyTreeFavoritesModule
  */
-class FamilyTreeFavoritesModuleTest extends PHPUnit_Framework_TestCase {
+class FamilyTreeFavoritesModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/FamilyTreeNewsModuleTest.php b/tests/app/Module/FamilyTreeNewsModuleTest.php
index a211d806f9..3eed7f06d8 100644
--- a/tests/app/Module/FamilyTreeNewsModuleTest.php
+++ b/tests/app/Module/FamilyTreeNewsModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FamilyTreeNewsModule
  */
-class FamilyTreeNewsModuleTest extends PHPUnit_Framework_TestCase {
+class FamilyTreeNewsModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/FamilyTreeStatisticsModuleTest.php b/tests/app/Module/FamilyTreeStatisticsModuleTest.php
index 0774c406ef..5617c662d8 100644
--- a/tests/app/Module/FamilyTreeStatisticsModuleTest.php
+++ b/tests/app/Module/FamilyTreeStatisticsModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FamilyTreeStatisticsModule
  */
-class FamilyTreeStatisticsModuleTest extends PHPUnit_Framework_TestCase {
+class FamilyTreeStatisticsModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/FrequentlyAskedQuestionsModuleTest.php b/tests/app/Module/FrequentlyAskedQuestionsModuleTest.php
index e14a8bca92..0836c41a21 100644
--- a/tests/app/Module/FrequentlyAskedQuestionsModuleTest.php
+++ b/tests/app/Module/FrequentlyAskedQuestionsModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class FrequentlyAskedQuestionsModule
  */
-class FrequentlyAskedQuestionsModuleTest extends PHPUnit_Framework_TestCase {
+class FrequentlyAskedQuestionsModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/GoogleMapsModuleTest.php b/tests/app/Module/GoogleMapsModuleTest.php
index 9715af17cd..11022e1a30 100644
--- a/tests/app/Module/GoogleMapsModuleTest.php
+++ b/tests/app/Module/GoogleMapsModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class GoogleMapsModule
  */
-class GoogleMapsModuleTest extends PHPUnit_Framework_TestCase {
+class GoogleMapsModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/HtmlBlockModuleTest.php b/tests/app/Module/HtmlBlockModuleTest.php
index deb3296c70..796f1551e7 100644
--- a/tests/app/Module/HtmlBlockModuleTest.php
+++ b/tests/app/Module/HtmlBlockModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class HtmlBlockModule
  */
-class HtmlBlockModuleTest extends PHPUnit_Framework_TestCase {
+class HtmlBlockModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/IndividualFactsTabModuleTest.php b/tests/app/Module/IndividualFactsTabModuleTest.php
index 6137503d18..b7a7adcf85 100644
--- a/tests/app/Module/IndividualFactsTabModuleTest.php
+++ b/tests/app/Module/IndividualFactsTabModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class IndividualFactsTabModule
  */
-class IndividualFactsTabModuleTest extends PHPUnit_Framework_TestCase {
+class IndividualFactsTabModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/IndividualFamiliesReportModuleTest.php b/tests/app/Module/IndividualFamiliesReportModuleTest.php
index f4e975d86e..873e20fc51 100644
--- a/tests/app/Module/IndividualFamiliesReportModuleTest.php
+++ b/tests/app/Module/IndividualFamiliesReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class IndividualFamiliesReportModule
  */
-class IndividualFamiliesReportModuleTest extends PHPUnit_Framework_TestCase {
+class IndividualFamiliesReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/IndividualReportModuleTest.php b/tests/app/Module/IndividualReportModuleTest.php
index 4460a3dba5..ad0f3a9530 100644
--- a/tests/app/Module/IndividualReportModuleTest.php
+++ b/tests/app/Module/IndividualReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class IndividualReportModule
  */
-class IndividualReportModuleTest extends PHPUnit_Framework_TestCase {
+class IndividualReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/IndividualSidebarModuleTest.php b/tests/app/Module/IndividualSidebarModuleTest.php
index 715f585603..4ba4796c29 100644
--- a/tests/app/Module/IndividualSidebarModuleTest.php
+++ b/tests/app/Module/IndividualSidebarModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class IndividualSidebarModule
  */
-class IndividualSidebarModuleTest extends PHPUnit_Framework_TestCase {
+class IndividualSidebarModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/InteractiveTree/TreeViewTest.php b/tests/app/Module/InteractiveTree/TreeViewTest.php
index 7646ff3e55..4c195ffcd3 100644
--- a/tests/app/Module/InteractiveTree/TreeViewTest.php
+++ b/tests/app/Module/InteractiveTree/TreeViewTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class TreeView
  */
-class TreeViewTest extends PHPUnit_Framework_TestCase {
+class TreeViewTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/InteractiveTreeModuleTest.php b/tests/app/Module/InteractiveTreeModuleTest.php
index 5dbbb791f5..146e496a49 100644
--- a/tests/app/Module/InteractiveTreeModuleTest.php
+++ b/tests/app/Module/InteractiveTreeModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class InteractiveTreeModule
  */
-class InteractiveTreeModuleTest extends PHPUnit_Framework_TestCase {
+class InteractiveTreeModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/LoggedInUsersModuleTest.php b/tests/app/Module/LoggedInUsersModuleTest.php
index 13feec5f0e..383ac68962 100644
--- a/tests/app/Module/LoggedInUsersModuleTest.php
+++ b/tests/app/Module/LoggedInUsersModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class LoggedInUsersModule
  */
-class LoggedInUsersModuleTest extends PHPUnit_Framework_TestCase {
+class LoggedInUsersModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/MarriageReportModuleTest.php b/tests/app/Module/MarriageReportModuleTest.php
index b52241a9d4..caa69a3acb 100644
--- a/tests/app/Module/MarriageReportModuleTest.php
+++ b/tests/app/Module/MarriageReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class MarriageReportModule
  */
-class MarriageReportModuleTest extends PHPUnit_Framework_TestCase {
+class MarriageReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/MediaTabModuleTest.php b/tests/app/Module/MediaTabModuleTest.php
index 6025e21d73..4edc3b05bb 100644
--- a/tests/app/Module/MediaTabModuleTest.php
+++ b/tests/app/Module/MediaTabModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class MediaTabModule
  */
-class MediaTabModuleTest extends PHPUnit_Framework_TestCase {
+class MediaTabModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/MissingFactsReportModuleTest.php b/tests/app/Module/MissingFactsReportModuleTest.php
index 1410184844..1d0e0bb2af 100644
--- a/tests/app/Module/MissingFactsReportModuleTest.php
+++ b/tests/app/Module/MissingFactsReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class MissingFactsReportModule
  */
-class MissingFactsReportModuleTest extends PHPUnit_Framework_TestCase {
+class MissingFactsReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ModuleBlockInterfaceTest.php b/tests/app/Module/ModuleBlockInterfaceTest.php
index 1a0004a531..5e7e58431f 100644
--- a/tests/app/Module/ModuleBlockInterfaceTest.php
+++ b/tests/app/Module/ModuleBlockInterfaceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ModuleBlockInterface
  */
-class ModuleBlockInterfaceTest extends PHPUnit_Framework_TestCase {
+class ModuleBlockInterfaceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ModuleChartInterfaceTest.php b/tests/app/Module/ModuleChartInterfaceTest.php
index 2024fe9b1f..72159a767c 100644
--- a/tests/app/Module/ModuleChartInterfaceTest.php
+++ b/tests/app/Module/ModuleChartInterfaceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ModuleChartInterface
  */
-class ModuleChartInterfaceTest extends PHPUnit_Framework_TestCase {
+class ModuleChartInterfaceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ModuleConfigInterfaceTest.php b/tests/app/Module/ModuleConfigInterfaceTest.php
index e1a464cc68..a3edb9f322 100644
--- a/tests/app/Module/ModuleConfigInterfaceTest.php
+++ b/tests/app/Module/ModuleConfigInterfaceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ModuleConfigInterface
  */
-class ModuleConfigInterfaceTest extends PHPUnit_Framework_TestCase {
+class ModuleConfigInterfaceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ModuleMenuInterfaceTest.php b/tests/app/Module/ModuleMenuInterfaceTest.php
index be1c833247..9dc63b7cd2 100644
--- a/tests/app/Module/ModuleMenuInterfaceTest.php
+++ b/tests/app/Module/ModuleMenuInterfaceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ModuleMenuInterface
  */
-class ModuleMenuInterfaceTest extends PHPUnit_Framework_TestCase {
+class ModuleMenuInterfaceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ModuleReportInterfaceTest.php b/tests/app/Module/ModuleReportInterfaceTest.php
index a1171fc4f1..73f8e9f682 100644
--- a/tests/app/Module/ModuleReportInterfaceTest.php
+++ b/tests/app/Module/ModuleReportInterfaceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ModuleReportInterface
  */
-class ModuleReportInterfaceTest extends PHPUnit_Framework_TestCase {
+class ModuleReportInterfaceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ModuleSidebarInterfaceTest.php b/tests/app/Module/ModuleSidebarInterfaceTest.php
index 253bb36a9d..1f6bd2b405 100644
--- a/tests/app/Module/ModuleSidebarInterfaceTest.php
+++ b/tests/app/Module/ModuleSidebarInterfaceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ModuleSidebarInterface
  */
-class ModuleSidebarInterfaceTest extends PHPUnit_Framework_TestCase {
+class ModuleSidebarInterfaceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ModuleTabInterfaceTest.php b/tests/app/Module/ModuleTabInterfaceTest.php
index e54eb86954..b31ece9ac5 100644
--- a/tests/app/Module/ModuleTabInterfaceTest.php
+++ b/tests/app/Module/ModuleTabInterfaceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ModuleTabInterface
  */
-class ModuleTabInterfaceTest extends PHPUnit_Framework_TestCase {
+class ModuleTabInterfaceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ModuleThemeInterfaceTest.php b/tests/app/Module/ModuleThemeInterfaceTest.php
index d8535bfb92..044c8cd841 100644
--- a/tests/app/Module/ModuleThemeInterfaceTest.php
+++ b/tests/app/Module/ModuleThemeInterfaceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ModuleThemeInterface
  */
-class ModuleThemeInterfaceTest extends PHPUnit_Framework_TestCase {
+class ModuleThemeInterfaceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/NotesTabModuleTest.php b/tests/app/Module/NotesTabModuleTest.php
index 539b332c47..1d2fd96695 100644
--- a/tests/app/Module/NotesTabModuleTest.php
+++ b/tests/app/Module/NotesTabModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class NotesTabModule
  */
-class NotesTabModuleTest extends PHPUnit_Framework_TestCase {
+class NotesTabModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/OccupationReportModuleTest.php b/tests/app/Module/OccupationReportModuleTest.php
index 0a1a316e48..6a4ce6372d 100644
--- a/tests/app/Module/OccupationReportModuleTest.php
+++ b/tests/app/Module/OccupationReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class OccupationReportModule
  */
-class OccupationReportModuleTest extends PHPUnit_Framework_TestCase {
+class OccupationReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/OnThisDayModuleTest.php b/tests/app/Module/OnThisDayModuleTest.php
index e3e1038096..203216d62d 100644
--- a/tests/app/Module/OnThisDayModuleTest.php
+++ b/tests/app/Module/OnThisDayModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class OnThisDayModule
  */
-class OnThisDayModuleTest extends PHPUnit_Framework_TestCase {
+class OnThisDayModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/PageMenuModuleTest.php b/tests/app/Module/PageMenuModuleTest.php
index 8cd5e941fb..f4cc9a0750 100644
--- a/tests/app/Module/PageMenuModuleTest.php
+++ b/tests/app/Module/PageMenuModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class PageMenuModule
  */
-class PageMenuModuleTest extends PHPUnit_Framework_TestCase {
+class PageMenuModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/PedigreeReportModuleTest.php b/tests/app/Module/PedigreeReportModuleTest.php
index d88d2d6b51..97d3cbefb0 100644
--- a/tests/app/Module/PedigreeReportModuleTest.php
+++ b/tests/app/Module/PedigreeReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class PedigreeReportModule
  */
-class PedigreeReportModuleTest extends PHPUnit_Framework_TestCase {
+class PedigreeReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/RecentChangesModuleTest.php b/tests/app/Module/RecentChangesModuleTest.php
index 5ccc6ba8c6..fd98a6c1ad 100644
--- a/tests/app/Module/RecentChangesModuleTest.php
+++ b/tests/app/Module/RecentChangesModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class RecentChangesModule
  */
-class RecentChangesModuleTest extends PHPUnit_Framework_TestCase {
+class RecentChangesModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/RelatedIndividualsReportModuleTest.php b/tests/app/Module/RelatedIndividualsReportModuleTest.php
index ea2e866f7a..e095119e01 100644
--- a/tests/app/Module/RelatedIndividualsReportModuleTest.php
+++ b/tests/app/Module/RelatedIndividualsReportModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class RelatedIndividualsReportModule
  */
-class RelatedIndividualsReportModuleTest extends PHPUnit_Framework_TestCase {
+class RelatedIndividualsReportModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/RelativesTabModuleTest.php b/tests/app/Module/RelativesTabModuleTest.php
index 43da392ce4..d25b54f8e6 100644
--- a/tests/app/Module/RelativesTabModuleTest.php
+++ b/tests/app/Module/RelativesTabModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class RelativesTabModule
  */
-class RelativesTabModuleTest extends PHPUnit_Framework_TestCase {
+class RelativesTabModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ResearchTaskModuleTest.php b/tests/app/Module/ResearchTaskModuleTest.php
index cd481c20fb..93517bcbc9 100644
--- a/tests/app/Module/ResearchTaskModuleTest.php
+++ b/tests/app/Module/ResearchTaskModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ResearchTaskModule
  */
-class ResearchTaskModuleTest extends PHPUnit_Framework_TestCase {
+class ResearchTaskModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ReviewChangesModuleTest.php b/tests/app/Module/ReviewChangesModuleTest.php
index a440ddc232..db1f2b10ee 100644
--- a/tests/app/Module/ReviewChangesModuleTest.php
+++ b/tests/app/Module/ReviewChangesModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ReviewChangesModule
  */
-class ReviewChangesModuleTest extends PHPUnit_Framework_TestCase {
+class ReviewChangesModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/SiteMapModuleTest.php b/tests/app/Module/SiteMapModuleTest.php
index 1a06b8cc6d..8ed322cbcf 100644
--- a/tests/app/Module/SiteMapModuleTest.php
+++ b/tests/app/Module/SiteMapModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class SiteMapModule
  */
-class SiteMapModuleTest extends PHPUnit_Framework_TestCase {
+class SiteMapModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/SlideShowModuleTest.php b/tests/app/Module/SlideShowModuleTest.php
index a196d4ac2b..dd3ff2d01a 100644
--- a/tests/app/Module/SlideShowModuleTest.php
+++ b/tests/app/Module/SlideShowModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class SlideShowModule
  */
-class SlideShowModuleTest extends PHPUnit_Framework_TestCase {
+class SlideShowModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/SourcesTabModuleTest.php b/tests/app/Module/SourcesTabModuleTest.php
index 804a4edb6e..a551758251 100644
--- a/tests/app/Module/SourcesTabModuleTest.php
+++ b/tests/app/Module/SourcesTabModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class SourcesTabModule
  */
-class SourcesTabModuleTest extends PHPUnit_Framework_TestCase {
+class SourcesTabModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/StoriesModuleTest.php b/tests/app/Module/StoriesModuleTest.php
index 10272c492d..2bce5cdb51 100644
--- a/tests/app/Module/StoriesModuleTest.php
+++ b/tests/app/Module/StoriesModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class StoriesModule
  */
-class StoriesModuleTest extends PHPUnit_Framework_TestCase {
+class StoriesModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/ThemeSelectModuleTest.php b/tests/app/Module/ThemeSelectModuleTest.php
index 4200c825f2..1944af9de9 100644
--- a/tests/app/Module/ThemeSelectModuleTest.php
+++ b/tests/app/Module/ThemeSelectModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ThemeSelectModule
  */
-class ThemeSelectModuleTest extends PHPUnit_Framework_TestCase {
+class ThemeSelectModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/TopGivenNamesModuleTest.php b/tests/app/Module/TopGivenNamesModuleTest.php
index 69c599a395..99cfe3730e 100644
--- a/tests/app/Module/TopGivenNamesModuleTest.php
+++ b/tests/app/Module/TopGivenNamesModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class TopGivenNamesModuleModule
  */
-class TopGivenNamesModuleTest extends PHPUnit_Framework_TestCase {
+class TopGivenNamesModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/TopPageViewsModuleTest.php b/tests/app/Module/TopPageViewsModuleTest.php
index 8ba5318bba..2b8a49ed6c 100644
--- a/tests/app/Module/TopPageViewsModuleTest.php
+++ b/tests/app/Module/TopPageViewsModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class TopPageViewsModule
  */
-class TopPageViewsModuleTest extends PHPUnit_Framework_TestCase {
+class TopPageViewsModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/TopSurnamesModuleTest.php b/tests/app/Module/TopSurnamesModuleTest.php
index 33377295f3..5d2bc7d321 100644
--- a/tests/app/Module/TopSurnamesModuleTest.php
+++ b/tests/app/Module/TopSurnamesModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class TopSurnamesModule
  */
-class TopSurnamesModuleTest extends PHPUnit_Framework_TestCase {
+class TopSurnamesModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/UpcomingAnniversariesModuleTest.php b/tests/app/Module/UpcomingAnniversariesModuleTest.php
index 4bd355ccfa..aedb5075cc 100644
--- a/tests/app/Module/UpcomingAnniversariesModuleTest.php
+++ b/tests/app/Module/UpcomingAnniversariesModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class UpcomingAnniversariesModule
  */
-class UpcomingAnniversariesModuleTest extends PHPUnit_Framework_TestCase {
+class UpcomingAnniversariesModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/UserFavoritesModuleTest.php b/tests/app/Module/UserFavoritesModuleTest.php
index 0634c39f25..63b25aef2e 100644
--- a/tests/app/Module/UserFavoritesModuleTest.php
+++ b/tests/app/Module/UserFavoritesModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class UserFavoritesModule
  */
-class UserFavoritesModuleTest extends PHPUnit_Framework_TestCase {
+class UserFavoritesModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/UserJournalModuleTest.php b/tests/app/Module/UserJournalModuleTest.php
index 40172aeb32..16da6f9ad5 100644
--- a/tests/app/Module/UserJournalModuleTest.php
+++ b/tests/app/Module/UserJournalModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class UserJournalModule
  */
-class UserJournalModuleTest extends PHPUnit_Framework_TestCase {
+class UserJournalModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/UserMessagesModuleTest.php b/tests/app/Module/UserMessagesModuleTest.php
index e873a67469..f9cdb1f239 100644
--- a/tests/app/Module/UserMessagesModuleTest.php
+++ b/tests/app/Module/UserMessagesModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class UserMessagesModule
  */
-class UserMessagesModuleTest extends PHPUnit_Framework_TestCase {
+class UserMessagesModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/UserWelcomeModuleTest.php b/tests/app/Module/UserWelcomeModuleTest.php
index 5ccc261a62..6a50464b38 100644
--- a/tests/app/Module/UserWelcomeModuleTest.php
+++ b/tests/app/Module/UserWelcomeModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class UserWelcomeModule
  */
-class UserWelcomeModuleTest extends PHPUnit_Framework_TestCase {
+class UserWelcomeModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/WelcomeBlockModuleTest.php b/tests/app/Module/WelcomeBlockModuleTest.php
index 0d3eff0748..e27ec30d4a 100644
--- a/tests/app/Module/WelcomeBlockModuleTest.php
+++ b/tests/app/Module/WelcomeBlockModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class WelcomeBlockModule
  */
-class WelcomeBlockModuleTest extends PHPUnit_Framework_TestCase {
+class WelcomeBlockModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Module/YahrzeitModuleTest.php b/tests/app/Module/YahrzeitModuleTest.php
index f349cdb4d6..d1b659da88 100644
--- a/tests/app/Module/YahrzeitModuleTest.php
+++ b/tests/app/Module/YahrzeitModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class YahrzeitModule
  */
-class YahrzeitModuleTest extends PHPUnit_Framework_TestCase {
+class YahrzeitModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/ModuleTest.php b/tests/app/ModuleTest.php
index b9a1943046..30c00e103c 100644
--- a/tests/app/ModuleTest.php
+++ b/tests/app/ModuleTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Module
  */
-class ModuleTest extends PHPUnit_Framework_TestCase {
+class ModuleTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/NoteTest.php b/tests/app/NoteTest.php
index 80e4b10d99..b3d219225d 100644
--- a/tests/app/NoteTest.php
+++ b/tests/app/NoteTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Note
  */
-class NoteTest extends PHPUnit_Framework_TestCase {
+class NoteTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/PlaceTest.php b/tests/app/PlaceTest.php
index 10be986ad1..4191630b4a 100644
--- a/tests/app/PlaceTest.php
+++ b/tests/app/PlaceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Place
  */
-class PlaceTest extends PHPUnit_Framework_TestCase {
+class PlaceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Query/QueryMediaTest.php b/tests/app/Query/QueryMediaTest.php
index 15754db82e..a247358bab 100644
--- a/tests/app/Query/QueryMediaTest.php
+++ b/tests/app/Query/QueryMediaTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class QueryMedia
  */
-class QueryMediaTest extends PHPUnit_Framework_TestCase {
+class QueryMediaTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Query/QueryNameTest.php b/tests/app/Query/QueryNameTest.php
index b53ff09290..3362d337e2 100644
--- a/tests/app/Query/QueryNameTest.php
+++ b/tests/app/Query/QueryNameTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class QueryName
  */
-class QueryNameTest extends PHPUnit_Framework_TestCase {
+class QueryNameTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Report/ReportBaseTest.php b/tests/app/Report/ReportBaseTest.php
index 5d25fb950f..529cf6f49c 100644
--- a/tests/app/Report/ReportBaseTest.php
+++ b/tests/app/Report/ReportBaseTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ReportBase
  */
-class ReportBaseTest extends PHPUnit_Framework_TestCase {
+class ReportBaseTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Report/ReportHTMLTest.php b/tests/app/Report/ReportHTMLTest.php
index 0d2eb49e6e..e1f3ea531a 100644
--- a/tests/app/Report/ReportHTMLTest.php
+++ b/tests/app/Report/ReportHTMLTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ReportHtml
  */
-class ReportHTMLTest extends PHPUnit_Framework_TestCase {
+class ReportHTMLTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/Report/ReportPDFTest.php b/tests/app/Report/ReportPDFTest.php
index 14de0fbd38..6f83036117 100644
--- a/tests/app/Report/ReportPDFTest.php
+++ b/tests/app/Report/ReportPDFTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class ReportPdf
  */
-class ReportPDFTest extends PHPUnit_Framework_TestCase {
+class ReportPDFTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/RepositoryTest.php b/tests/app/RepositoryTest.php
index 5e96ae5790..822e7b23bb 100644
--- a/tests/app/RepositoryTest.php
+++ b/tests/app/RepositoryTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Repository
  */
-class RepositoryTest extends PHPUnit_Framework_TestCase {
+class RepositoryTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/SiteTest.php b/tests/app/SiteTest.php
index d01a8fd970..e28ac8d149 100644
--- a/tests/app/SiteTest.php
+++ b/tests/app/SiteTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Site
  */
-class SiteTest extends PHPUnit_Framework_TestCase {
+class SiteTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/SoundexTest.php b/tests/app/SoundexTest.php
index 79d5212daa..30aaf6571b 100644
--- a/tests/app/SoundexTest.php
+++ b/tests/app/SoundexTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Soundex
  */
-class SoundexTest extends PHPUnit_Framework_TestCase {
+class SoundexTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/SourceTest.php b/tests/app/SourceTest.php
index b46c039253..825a93766a 100644
--- a/tests/app/SourceTest.php
+++ b/tests/app/SourceTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Source
  */
-class SourceTest extends PHPUnit_Framework_TestCase {
+class SourceTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/StatementTest.php b/tests/app/StatementTest.php
index 8234c3c1e4..a85f9ac615 100644
--- a/tests/app/StatementTest.php
+++ b/tests/app/StatementTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Statement
  */
-class StatementTest extends PHPUnit_Framework_TestCase {
+class StatementTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/StatsTest.php b/tests/app/StatsTest.php
index 178112eb3f..012fa4be00 100644
--- a/tests/app/StatsTest.php
+++ b/tests/app/StatsTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Stats
  */
-class StatsTest extends PHPUnit_Framework_TestCase {
+class StatsTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php
index bb7d5693c7..422ec17786 100644
--- a/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/DefaultSurnameTraditionTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\SurnameTradition\SurnameTraditionInterface;
 /**
  * Test harness for the class SpanishSurnameTradition
  */
-class DefaultSurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class DefaultSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/** @var SurnameTraditionInterface */
 	private $surname_tradition;
 
diff --git a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php
index 2260e2d0e3..1f6cb12a5f 100644
--- a/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/IcelandicSurnameTraditionTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\SurnameTradition\SurnameTraditionInterface;
 /**
  * Test harness for the class SpanishSurnameTradition
  */
-class IcelandicSurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class IcelandicSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/** @var SurnameTraditionInterface */
 	private $surname_tradition;
 
diff --git a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php
index 27033f80b8..8b8a153094 100644
--- a/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/LithuanianSurnameTraditionTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\SurnameTradition\SurnameTraditionInterface;
 /**
  * Test harness for the class SpanishSurnameTradition
  */
-class LithuanianSurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class LithuanianSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/** @var SurnameTraditionInterface */
 	private $surname_tradition;
 
diff --git a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php
index 418c787274..21003eae04 100644
--- a/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/MatrilinealSurnameTraditionTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\SurnameTradition\SurnameTraditionInterface;
 /**
  * Test harness for the class PatrilinenalSurnameTradition
  */
-class MatrilinealSurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class MatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/** @var SurnameTraditionInterface */
 	private $surname_tradition;
 
diff --git a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php
index ac63eee00c..5f3724dd45 100644
--- a/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PaternalSurnameTraditionTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\SurnameTradition\SurnameTraditionInterface;
 /**
  * Test harness for the class PaternalSurnameTradition
  */
-class PaternalSurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class PaternalSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/** @var SurnameTraditionInterface */
 	private $surname_tradition;
 
diff --git a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php
index 3d1f6782ba..bce5162687 100644
--- a/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PatrilinealSurnameTraditionTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\SurnameTradition\SurnameTraditionInterface;
 /**
  * Test harness for the class PatrilinenalSurnameTradition
  */
-class PatrilinealSurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class PatrilinealSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/** @var SurnameTraditionInterface */
 	private $surname_tradition;
 
diff --git a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php
index 24b9b71042..885cf6f879 100644
--- a/tests/app/SurnameTradition/PolishSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PolishSurnameTraditionTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\SurnameTradition\SurnameTraditionInterface;
 /**
  * Test harness for the class SpanishSurnameTradition
  */
-class PolishSurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class PolishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/** @var SurnameTraditionInterface */
 	private $surname_tradition;
 
diff --git a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php
index 4ae5e80e4e..0f1e2356de 100644
--- a/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/PortugueseSurnameTraditionTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\SurnameTradition\SurnameTraditionInterface;
 /**
  * Test harness for the class SpanishSurnameTradition
  */
-class PortugueseSurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class PortugueseSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/** @var SurnameTraditionInterface */
 	private $surname_tradition;
 
diff --git a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php
index d06066050d..4eae398e9d 100644
--- a/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php
+++ b/tests/app/SurnameTradition/SpanishSurnameTraditionTest.php
@@ -20,7 +20,7 @@ use Fisharebest\Webtrees\SurnameTradition\SurnameTraditionInterface;
 /**
  * Test harness for the class SpanishSurnameTradition
  */
-class SpanishSurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class SpanishSurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/** @var SurnameTraditionInterface */
 	private $surname_tradition;
 
diff --git a/tests/app/SurnameTraditionTest.php b/tests/app/SurnameTraditionTest.php
index 5e32a69b15..601121c44a 100644
--- a/tests/app/SurnameTraditionTest.php
+++ b/tests/app/SurnameTraditionTest.php
@@ -28,7 +28,7 @@ use Fisharebest\Webtrees\SurnameTradition\SpanishSurnameTradition;
 /**
  * Test harness for the class Soundex
  */
-class SurnameTraditionTest extends PHPUnit_Framework_TestCase {
+class SurnameTraditionTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/TreeTest.php b/tests/app/TreeTest.php
index 727bde14bc..0d31b8f609 100644
--- a/tests/app/TreeTest.php
+++ b/tests/app/TreeTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class Tree
  */
-class TreeTest extends PHPUnit_Framework_TestCase {
+class TreeTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/tests/app/UserTest.php b/tests/app/UserTest.php
index b49019a96e..aa8b5bce13 100644
--- a/tests/app/UserTest.php
+++ b/tests/app/UserTest.php
@@ -18,7 +18,7 @@
 /**
  * Test harness for the class WT_User
  */
-class UserTest extends PHPUnit_Framework_TestCase {
+class UserTest extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepare the environment for these tests
 	 */
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Cloud/StorageService/Adapter/FileSystem.php b/vendor/bombayworks/zendframework1/library/Zend/Cloud/StorageService/Adapter/FileSystem.php
index 7d5aaaa93c..08c5d75f1a 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Cloud/StorageService/Adapter/FileSystem.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Cloud/StorageService/Adapter/FileSystem.php
@@ -104,7 +104,7 @@ class Zend_Cloud_StorageService_Adapter_FileSystem implements Zend_Cloud_Storage
     {
         $path = $this->_getFullPath($destinationPath);
         file_put_contents($path, $data);
-        chmod($path, 0777);
+        chmod($path, 0775);
     }
 
     /**
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Console/Getopt.php b/vendor/bombayworks/zendframework1/library/Zend/Console/Getopt.php
index 6ffa3768bc..7fe125dec6 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Console/Getopt.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Console/Getopt.php
@@ -173,14 +173,14 @@ class Zend_Console_Getopt
     );
 
     /**
-     * Stores the command-line arguments for the calling applicaion.
+     * Stores the command-line arguments for the calling application.
      *
      * @var array
      */
     protected $_argv = array();
 
     /**
-     * Stores the name of the calling applicaion.
+     * Stores the name of the calling application.
      *
      * @var string
      */
@@ -550,7 +550,7 @@ class Zend_Console_Getopt
      * current application invocation.
      *
      * This function returns true, or the parameter value to the option, if any.
-     * If the option was not given, this function returns false.
+     * If the option was not given, this function returns null.
      *
      * @param  string $flag
      * @return mixed
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Abstract.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Abstract.php
index 35373a7bf3..ccbbf669f8 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Abstract.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Abstract.php
@@ -292,6 +292,8 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract
         if (is_int($value) || is_float($value)) {
             return $value;
         }
+        // Fix for null-byte injection
+        $value = addcslashes($value, "\000\032");
         $this->_connect();
         return $this->_connection->quote($value);
     }
@@ -398,4 +400,3 @@ abstract class Zend_Db_Adapter_Pdo_Abstract extends Zend_Db_Adapter_Abstract
         }
     }
 }
-
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mssql.php b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mssql.php
index 7d0a3829af..367abc326a 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mssql.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Db/Adapter/Pdo/Mssql.php
@@ -410,7 +410,7 @@ class Zend_Db_Adapter_Pdo_Mssql extends Zend_Db_Adapter_Pdo_Abstract
     public function getServerVersion()
     {
         try {
-            $stmt = $this->query("SELECT SERVERPROPERTY('productversion')");
+            $stmt = $this->query("SELECT CAST(SERVERPROPERTY('productversion') AS VARCHAR)");
             $result = $stmt->fetchAll(Zend_Db::FETCH_NUM);
             if (count($result)) {
                 return $result[0][0];
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Dom/Query.php b/vendor/bombayworks/zendframework1/library/Zend/Dom/Query.php
index 6a8673a69d..6405e0223e 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Dom/Query.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Dom/Query.php
@@ -48,13 +48,14 @@ class Zend_Dom_Query
     /**#@+
      * Document types
      */
+    const DOC_DOM   = 'docDom';
     const DOC_XML   = 'docXml';
     const DOC_HTML  = 'docHtml';
     const DOC_XHTML = 'docXhtml';
     /**#@-*/
 
     /**
-     * @var string
+     * @var string|DOMDocument
      */
     protected $_document;
 
@@ -85,7 +86,7 @@ class Zend_Dom_Query
     /**
      * Constructor
      *
-     * @param null|string $document
+     * @param null|string|DOMDocument $document
      * @param null|string $encoding
      */
     public function __construct($document = null, $encoding = null)
@@ -119,12 +120,15 @@ class Zend_Dom_Query
     /**
      * Set document to query
      *
-     * @param  string $document
+     * @param  string|DOMDocument $document
      * @param  null|string $encoding Document encoding
      * @return Zend_Dom_Query
      */
     public function setDocument($document, $encoding = null)
     {
+        if ($document instanceof DOMDocument) {
+            return $this->setDocumentDom($document);
+        }
         if (0 === strlen($document)) {
             return $this;
         }
@@ -143,6 +147,22 @@ class Zend_Dom_Query
     }
 
     /**
+     * Set DOMDocument to query
+     *
+     * @param  DOMDocument $document
+     * @return Zend_Dom_Query
+     */
+    public function setDocumentDom(DOMDocument $document)
+    {
+        $this->_document = $document;
+        $this->_docType  = self::DOC_DOM;
+        if (null !== $document->encoding) {
+            $this->setEncoding($document->encoding);
+        }
+        return $this;
+    }
+
+    /**
      * Register HTML document
      *
      * @param  string $document
@@ -196,7 +216,7 @@ class Zend_Dom_Query
     /**
      * Retrieve current document
      *
-     * @return string
+     * @return string|DOMDocument
      */
     public function getDocument()
     {
@@ -259,6 +279,10 @@ class Zend_Dom_Query
         }
         $type   = $this->getDocumentType();
         switch ($type) {
+            case self::DOC_DOM:
+                $domDoc = $this->_document;
+                $success = true;
+                break;
             case self::DOC_XML:
                 try {
                     $domDoc = Zend_Xml_Security::scan($document, $domDoc);
@@ -295,8 +319,7 @@ class Zend_Dom_Query
     /**
      * Register XPath namespaces
      *
-     * @param   array $xpathNamespaces
-     * @return  void
+     * @param array $xpathNamespaces
      */
     public function registerXpathNamespaces($xpathNamespaces)
     {
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Http/Client/Adapter/Curl.php b/vendor/bombayworks/zendframework1/library/Zend/Http/Client/Adapter/Curl.php
index 76df3d5672..45e7312e33 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Http/Client/Adapter/Curl.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Http/Client/Adapter/Curl.php
@@ -222,7 +222,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
         }
 
         // Set connection timeout
-        $connectTimeout  = $this->config['timeout'];
+        $connectTimeout  = $this->_config['timeout'];
         $constant        = CURLOPT_CONNECTTIMEOUT;
         if (defined('CURLOPT_CONNECTTIMEOUT_MS')) {
             $connectTimeout *= 1000;
@@ -232,7 +232,7 @@ class Zend_Http_Client_Adapter_Curl implements Zend_Http_Client_Adapter_Interfac
 
         // Set request timeout (once connection is established)
         if (array_key_exists('request_timeout', $this->_config)) {
-            $requestTimeout  = $this->config['request_timeout'];
+            $requestTimeout  = $this->_config['request_timeout'];
             $constant        = CURLOPT_TIMEOUT;
             if (defined('CURLOPT_TIMEOUT_MS')) {
                 $requestTimeout *= 1000;
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Log.php b/vendor/bombayworks/zendframework1/library/Zend/Log.php
index 0c57b55e0b..80a14efbd6 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Log.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Log.php
@@ -25,6 +25,17 @@
  * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
+ *
+ * Convenience methods for log [@see Zend_Log::__call()]:
+ *
+ * @method emerg(string $message, $extras = null)
+ * @method alert(string $message, $extras = null)
+ * @method crit(string $message, $extras = null)
+ * @method err(string $message, $extras = null)
+ * @method warn(string $message, $extras = null)
+ * @method notice(string $message, $extras = null)
+ * @method info(string $message, $extras = null)
+ * @method debug(string $message, $extras = null)
  */
 class Zend_Log
 {
@@ -104,7 +115,6 @@ class Zend_Log
      * Class constructor.  Create a new logger
      *
      * @param Zend_Log_Writer_Abstract|null  $writer  default writer
-     * @return void
      */
     public function __construct(Zend_Log_Writer_Abstract $writer = null)
     {
@@ -173,7 +183,7 @@ class Zend_Log
     /**
      * Construct a writer object based on a configuration array
      *
-     * @param  array $spec config array with writer spec
+     * @param  array $config config array with writer spec
      * @return Zend_Log_Writer_Abstract
      * @throws Zend_Log_Exception
      */
@@ -351,6 +361,7 @@ class Zend_Log
      */
     public function __destruct()
     {
+        /** @var Zend_Log_Writer_Abstract $writer */
         foreach($this->_writers as $writer) {
             $writer->shutdown();
         }
@@ -440,6 +451,7 @@ class Zend_Log
         }
 
         // abort if rejected by the global filters
+        /** @var Zend_Log_Filter_Interface $filter */
         foreach ($this->_filters as $filter) {
             if (! $filter->accept($event)) {
                 return;
@@ -447,6 +459,7 @@ class Zend_Log
         }
 
         // send to each writer
+        /** @var Zend_Log_Writer_Abstract $writer */
         foreach ($this->_writers as $writer) {
             $writer->write($event);
         }
@@ -455,8 +468,9 @@ class Zend_Log
     /**
      * Add a custom priority
      *
-     * @param  string   $name      Name of priority
-     * @param  integer  $priority  Numeric priority
+     * @param  string  $name     Name of priority
+     * @param  integer $priority Numeric priority
+     * @return $this
      * @throws Zend_Log_Exception
      */
     public function addPriority($name, $priority)
@@ -481,7 +495,7 @@ class Zend_Log
      * must be accepted by all filters added with this method.
      *
      * @param  int|Zend_Config|array|Zend_Log_Filter_Interface $filter
-     * @return Zend_Log
+     * @return $this
      * @throws Zend_Log_Exception
      */
     public function addFilter($filter)
@@ -510,6 +524,7 @@ class Zend_Log
      *
      * @param  mixed $writer Zend_Log_Writer_Abstract or Config array
      * @return Zend_Log
+     * @throws Zend_Log_Exception
      */
     public function addWriter($writer)
     {
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php b/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php
index 61b681b0ba..a622a64333 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Search/Lucene/Storage/Directory/Filesystem.php
@@ -90,8 +90,10 @@ class Zend_Search_Lucene_Storage_Directory_Filesystem extends Zend_Search_Lucene
      * @return boolean
      */
 
-    public static function mkdirs($dir, $mode = 0777, $recursive = true)
+    public static function mkdirs($dir, $mode = 0775, $recursive = true)
     {
+        $mode = $mode & ~0002;
+
         if (($dir === null) || $dir === '') {
             return false;
         }
@@ -360,4 +362,3 @@ class Zend_Search_Lucene_Storage_Directory_Filesystem extends Zend_Search_Lucene
         return $this->_fileHandlers[$filename];
     }
 }
-
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php b/vendor/bombayworks/zendframework1/library/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php
index e2c251206c..113e7beb32 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Service/WindowsAzure/CommandLine/PackageScaffolder/PackageScaffolderAbstract.php
@@ -119,13 +119,13 @@ abstract class Zend_Service_WindowsAzure_CommandLine_PackageScaffolder_PackageSc
         }
         
         if (is_dir($path) ) {
-            @chmod($path, '0777');
+            @chmod($path, '0775');
             if (!self::deleteDirectory($path) ) {
                 throw new RuntimeException("Failed to delete \"{$path}\".");
             }
         }
             
-        if (!mkdir($path, '0777', $recursive) || !is_dir($path)) {
+        if (!mkdir($path, '0775', $recursive) || !is_dir($path)) {
             throw new RuntimeException( "Failed to create directory \"{$path}\"." );
         }
 
@@ -142,7 +142,9 @@ abstract class Zend_Service_WindowsAzure_CommandLine_PackageScaffolder_PackageSc
      * 
      * @return boolean
      */
-    protected function copyDirectory($sourcePath, $destinationPath, $abortIfExists = true, $mode = '0777') {
+    protected function copyDirectory($sourcePath, $destinationPath, $abortIfExists = true, $mode = '0775') {
+        $mode = $mode & ~0002;
+
         if (is_null($sourcePath) || !is_string($sourcePath) || empty($sourcePath)) {
             throw new InvalidArgumentException("Undefined \"sourcePath\"");
         }
@@ -217,7 +219,7 @@ abstract class Zend_Service_WindowsAzure_CommandLine_PackageScaffolder_PackageSc
         if (!$handleDir) {
             return false;
         }
-        @chmod($path, 0777);
+        @chmod($path, 0775);
         while ($file = readdir($handleDir)) {
             if ($file == '.' || $file == '..') {
                 continue;
@@ -240,7 +242,7 @@ abstract class Zend_Service_WindowsAzure_CommandLine_PackageScaffolder_PackageSc
             );
         }
         
-        @chmod($path, 0777);        
+        @chmod($path, 0775);        
         closedir($handleDir);
         @rmdir($path);
                      
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Validate/Hostname.php b/vendor/bombayworks/zendframework1/library/Zend/Validate/Hostname.php
index d67e698585..0d063ecad6 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Validate/Hostname.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Validate/Hostname.php
@@ -1043,7 +1043,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
         'CL'  => array(1 => '/^[\x{002d}0-9a-záéíñóúü]{1,63}$/iu'),
         'CN'  => 'Hostname/Cn.php',
         'COM' => 'Hostname/Com.php',
-        'DE'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
+        'DE'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿăąāćĉčċďđĕěėęēğĝġģĥħĭĩįīıĵķĺľļłńňņŋŏőōœĸŕřŗśŝšşťßţŧŭůűũųūŵŷźžż]{1,63}$/iu'),
         'DK'  => array(1 => '/^[\x{002d}0-9a-zäéöüæøå]{1,63}$/iu'),
         'ES'  => array(1 => '/^[\x{002d}0-9a-zàáçèéíïñòóúü·]{1,63}$/iu'),
         'EU'  => array(1 => '/^[\x{002d}0-9a-zà-öø-ÿ]{1,63}$/iu',
@@ -1459,7 +1459,7 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
                     $check = 0;
                     foreach ($domainParts as $domainPart) {
                         // If some domain part is empty (i.e. zend..com), it's invalid
-                        if (empty($domainPart)) {
+                        if (empty($domainPart) && $domainPart !== '0') {
                             $this->_error(self::INVALID_HOSTNAME);
                             return false;
                         }
diff --git a/vendor/bombayworks/zendframework1/library/Zend/Version.php b/vendor/bombayworks/zendframework1/library/Zend/Version.php
index e6567dde39..a5f244f711 100644
--- a/vendor/bombayworks/zendframework1/library/Zend/Version.php
+++ b/vendor/bombayworks/zendframework1/library/Zend/Version.php
@@ -32,7 +32,7 @@ final class Zend_Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '1.12.15';
+    const VERSION = '1.12.16';
 
     /**
      * The latest stable version Zend Framework available
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 7c94ab81cb..17f6a802f8 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -7,10 +7,511 @@ $baseDir = dirname($vendorDir);
 
 return array(
     'Datamatrix' => $vendorDir . '/tecnick.com/tcpdf/include/barcodes/datamatrix.php',
+    'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/src/Iterator.php',
+    'File_Iterator_Facade' => $vendorDir . '/phpunit/php-file-iterator/src/Facade.php',
+    'File_Iterator_Factory' => $vendorDir . '/phpunit/php-file-iterator/src/Factory.php',
+    'Hamcrest\\Arrays\\IsArray' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Arrays/IsArray.php',
+    'Hamcrest\\Arrays\\IsArrayContaining' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Arrays/IsArrayContaining.php',
+    'Hamcrest\\Arrays\\IsArrayContainingInAnyOrder' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Arrays/IsArrayContainingInAnyOrder.php',
+    'Hamcrest\\Arrays\\IsArrayContainingInOrder' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Arrays/IsArrayContainingInOrder.php',
+    'Hamcrest\\Arrays\\IsArrayContainingKey' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Arrays/IsArrayContainingKey.php',
+    'Hamcrest\\Arrays\\IsArrayContainingKeyValuePair' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Arrays/IsArrayContainingKeyValuePair.php',
+    'Hamcrest\\Arrays\\IsArrayWithSize' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Arrays/IsArrayWithSize.php',
+    'Hamcrest\\Arrays\\MatchingOnce' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Arrays/MatchingOnce.php',
+    'Hamcrest\\Arrays\\SeriesMatchingOnce' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Arrays/SeriesMatchingOnce.php',
+    'Hamcrest\\AssertionError' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/AssertionError.php',
+    'Hamcrest\\BaseDescription' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/BaseDescription.php',
+    'Hamcrest\\BaseMatcher' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/BaseMatcher.php',
+    'Hamcrest\\Collection\\IsEmptyTraversable' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Collection/IsEmptyTraversable.php',
+    'Hamcrest\\Collection\\IsTraversableWithSize' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Collection/IsTraversableWithSize.php',
+    'Hamcrest\\Core\\AllOf' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/AllOf.php',
+    'Hamcrest\\Core\\AnyOf' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/AnyOf.php',
+    'Hamcrest\\Core\\CombinableMatcher' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/CombinableMatcher.php',
+    'Hamcrest\\Core\\DescribedAs' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/DescribedAs.php',
+    'Hamcrest\\Core\\Every' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/Every.php',
+    'Hamcrest\\Core\\HasToString' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/HasToString.php',
+    'Hamcrest\\Core\\Is' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/Is.php',
+    'Hamcrest\\Core\\IsAnything' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/IsAnything.php',
+    'Hamcrest\\Core\\IsCollectionContaining' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/IsCollectionContaining.php',
+    'Hamcrest\\Core\\IsEqual' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/IsEqual.php',
+    'Hamcrest\\Core\\IsIdentical' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/IsIdentical.php',
+    'Hamcrest\\Core\\IsInstanceOf' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/IsInstanceOf.php',
+    'Hamcrest\\Core\\IsNot' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/IsNot.php',
+    'Hamcrest\\Core\\IsNull' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/IsNull.php',
+    'Hamcrest\\Core\\IsSame' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/IsSame.php',
+    'Hamcrest\\Core\\IsTypeOf' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/IsTypeOf.php',
+    'Hamcrest\\Core\\Set' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/Set.php',
+    'Hamcrest\\Core\\ShortcutCombination' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Core/ShortcutCombination.php',
+    'Hamcrest\\Description' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Description.php',
+    'Hamcrest\\DiagnosingMatcher' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/DiagnosingMatcher.php',
+    'Hamcrest\\FeatureMatcher' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/FeatureMatcher.php',
+    'Hamcrest\\Internal\\SelfDescribingValue' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Internal/SelfDescribingValue.php',
+    'Hamcrest\\Matcher' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Matcher.php',
+    'Hamcrest\\MatcherAssert' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/MatcherAssert.php',
+    'Hamcrest\\Matchers' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Matchers.php',
+    'Hamcrest\\NullDescription' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/NullDescription.php',
+    'Hamcrest\\Number\\IsCloseTo' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Number/IsCloseTo.php',
+    'Hamcrest\\Number\\OrderingComparison' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Number/OrderingComparison.php',
+    'Hamcrest\\SelfDescribing' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/SelfDescribing.php',
+    'Hamcrest\\StringDescription' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/StringDescription.php',
+    'Hamcrest\\Text\\IsEmptyString' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/IsEmptyString.php',
+    'Hamcrest\\Text\\IsEqualIgnoringCase' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/IsEqualIgnoringCase.php',
+    'Hamcrest\\Text\\IsEqualIgnoringWhiteSpace' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/IsEqualIgnoringWhiteSpace.php',
+    'Hamcrest\\Text\\MatchesPattern' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/MatchesPattern.php',
+    'Hamcrest\\Text\\StringContains' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/StringContains.php',
+    'Hamcrest\\Text\\StringContainsIgnoringCase' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/StringContainsIgnoringCase.php',
+    'Hamcrest\\Text\\StringContainsInOrder' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/StringContainsInOrder.php',
+    'Hamcrest\\Text\\StringEndsWith' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/StringEndsWith.php',
+    'Hamcrest\\Text\\StringStartsWith' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/StringStartsWith.php',
+    'Hamcrest\\Text\\SubstringMatcher' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Text/SubstringMatcher.php',
+    'Hamcrest\\TypeSafeDiagnosingMatcher' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/TypeSafeDiagnosingMatcher.php',
+    'Hamcrest\\TypeSafeMatcher' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/TypeSafeMatcher.php',
+    'Hamcrest\\Type\\IsArray' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsArray.php',
+    'Hamcrest\\Type\\IsBoolean' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsBoolean.php',
+    'Hamcrest\\Type\\IsCallable' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsCallable.php',
+    'Hamcrest\\Type\\IsDouble' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsDouble.php',
+    'Hamcrest\\Type\\IsInteger' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsInteger.php',
+    'Hamcrest\\Type\\IsNumeric' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsNumeric.php',
+    'Hamcrest\\Type\\IsObject' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsObject.php',
+    'Hamcrest\\Type\\IsResource' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsResource.php',
+    'Hamcrest\\Type\\IsScalar' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsScalar.php',
+    'Hamcrest\\Type\\IsString' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Type/IsString.php',
+    'Hamcrest\\Util' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Util.php',
+    'Hamcrest\\Xml\\HasXPath' => $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest/Xml/HasXPath.php',
     'Normalizer' => $vendorDir . '/patchwork/utf8/src/Normalizer.php',
     'PDF417' => $vendorDir . '/tecnick.com/tcpdf/include/barcodes/pdf417.php',
+    'PHPUnit_Exception' => $vendorDir . '/phpunit/phpunit/src/Exception.php',
+    'PHPUnit_Extensions_GroupTestSuite' => $vendorDir . '/phpunit/phpunit/src/Extensions/GroupTestSuite.php',
+    'PHPUnit_Extensions_PhptTestCase' => $vendorDir . '/phpunit/phpunit/src/Extensions/PhptTestCase.php',
+    'PHPUnit_Extensions_PhptTestSuite' => $vendorDir . '/phpunit/phpunit/src/Extensions/PhptTestSuite.php',
+    'PHPUnit_Extensions_RepeatedTest' => $vendorDir . '/phpunit/phpunit/src/Extensions/RepeatedTest.php',
+    'PHPUnit_Extensions_TestDecorator' => $vendorDir . '/phpunit/phpunit/src/Extensions/TestDecorator.php',
+    'PHPUnit_Extensions_TicketListener' => $vendorDir . '/phpunit/phpunit/src/Extensions/TicketListener.php',
+    'PHPUnit_Framework_Assert' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert.php',
+    'PHPUnit_Framework_AssertionFailedError' => $vendorDir . '/phpunit/phpunit/src/Framework/AssertionFailedError.php',
+    'PHPUnit_Framework_BaseTestListener' => $vendorDir . '/phpunit/phpunit/src/Framework/BaseTestListener.php',
+    'PHPUnit_Framework_CodeCoverageException' => $vendorDir . '/phpunit/phpunit/src/Framework/CodeCoverageException.php',
+    'PHPUnit_Framework_Constraint' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint.php',
+    'PHPUnit_Framework_Constraint_And' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/And.php',
+    'PHPUnit_Framework_Constraint_ArrayHasKey' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ArrayHasKey.php',
+    'PHPUnit_Framework_Constraint_ArraySubset' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ArraySubset.php',
+    'PHPUnit_Framework_Constraint_Attribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Attribute.php',
+    'PHPUnit_Framework_Constraint_Callback' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Callback.php',
+    'PHPUnit_Framework_Constraint_ClassHasAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ClassHasAttribute.php',
+    'PHPUnit_Framework_Constraint_ClassHasStaticAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ClassHasStaticAttribute.php',
+    'PHPUnit_Framework_Constraint_Composite' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Composite.php',
+    'PHPUnit_Framework_Constraint_Count' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Count.php',
+    'PHPUnit_Framework_Constraint_Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Exception.php',
+    'PHPUnit_Framework_Constraint_ExceptionCode' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionCode.php',
+    'PHPUnit_Framework_Constraint_ExceptionMessage' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionMessage.php',
+    'PHPUnit_Framework_Constraint_ExceptionMessageRegExp' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ExceptionMessageRegExp.php',
+    'PHPUnit_Framework_Constraint_FileExists' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/FileExists.php',
+    'PHPUnit_Framework_Constraint_GreaterThan' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/GreaterThan.php',
+    'PHPUnit_Framework_Constraint_IsAnything' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsAnything.php',
+    'PHPUnit_Framework_Constraint_IsEmpty' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsEmpty.php',
+    'PHPUnit_Framework_Constraint_IsEqual' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsEqual.php',
+    'PHPUnit_Framework_Constraint_IsFalse' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsFalse.php',
+    'PHPUnit_Framework_Constraint_IsIdentical' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsIdentical.php',
+    'PHPUnit_Framework_Constraint_IsInstanceOf' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsInstanceOf.php',
+    'PHPUnit_Framework_Constraint_IsJson' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsJson.php',
+    'PHPUnit_Framework_Constraint_IsNull' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsNull.php',
+    'PHPUnit_Framework_Constraint_IsTrue' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsTrue.php',
+    'PHPUnit_Framework_Constraint_IsType' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/IsType.php',
+    'PHPUnit_Framework_Constraint_JsonMatches' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/JsonMatches.php',
+    'PHPUnit_Framework_Constraint_JsonMatches_ErrorMessageProvider' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/JsonMatches/ErrorMessageProvider.php',
+    'PHPUnit_Framework_Constraint_LessThan' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/LessThan.php',
+    'PHPUnit_Framework_Constraint_Not' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Not.php',
+    'PHPUnit_Framework_Constraint_ObjectHasAttribute' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/ObjectHasAttribute.php',
+    'PHPUnit_Framework_Constraint_Or' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Or.php',
+    'PHPUnit_Framework_Constraint_PCREMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/PCREMatch.php',
+    'PHPUnit_Framework_Constraint_SameSize' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/SameSize.php',
+    'PHPUnit_Framework_Constraint_StringContains' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringContains.php',
+    'PHPUnit_Framework_Constraint_StringEndsWith' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringEndsWith.php',
+    'PHPUnit_Framework_Constraint_StringMatches' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringMatches.php',
+    'PHPUnit_Framework_Constraint_StringStartsWith' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/StringStartsWith.php',
+    'PHPUnit_Framework_Constraint_TraversableContains' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/TraversableContains.php',
+    'PHPUnit_Framework_Constraint_TraversableContainsOnly' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/TraversableContainsOnly.php',
+    'PHPUnit_Framework_Constraint_Xor' => $vendorDir . '/phpunit/phpunit/src/Framework/Constraint/Xor.php',
+    'PHPUnit_Framework_Error' => $vendorDir . '/phpunit/phpunit/src/Framework/Error.php',
+    'PHPUnit_Framework_Error_Deprecated' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Deprecated.php',
+    'PHPUnit_Framework_Error_Notice' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Notice.php',
+    'PHPUnit_Framework_Error_Warning' => $vendorDir . '/phpunit/phpunit/src/Framework/Error/Warning.php',
+    'PHPUnit_Framework_Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/Exception.php',
+    'PHPUnit_Framework_ExceptionWrapper' => $vendorDir . '/phpunit/phpunit/src/Framework/ExceptionWrapper.php',
+    'PHPUnit_Framework_ExpectationFailedException' => $vendorDir . '/phpunit/phpunit/src/Framework/ExpectationFailedException.php',
+    'PHPUnit_Framework_IncompleteTest' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTest.php',
+    'PHPUnit_Framework_IncompleteTestCase' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestCase.php',
+    'PHPUnit_Framework_IncompleteTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
+    'PHPUnit_Framework_InvalidCoversTargetError' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetError.php',
+    'PHPUnit_Framework_InvalidCoversTargetException' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
+    'PHPUnit_Framework_MockObject_BadMethodCallException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/BadMethodCallException.php',
+    'PHPUnit_Framework_MockObject_Builder_Identity' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Identity.php',
+    'PHPUnit_Framework_MockObject_Builder_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/InvocationMocker.php',
+    'PHPUnit_Framework_MockObject_Builder_Match' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Match.php',
+    'PHPUnit_Framework_MockObject_Builder_MethodNameMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/MethodNameMatch.php',
+    'PHPUnit_Framework_MockObject_Builder_Namespace' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Namespace.php',
+    'PHPUnit_Framework_MockObject_Builder_ParametersMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/ParametersMatch.php',
+    'PHPUnit_Framework_MockObject_Builder_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Builder/Stub.php',
+    'PHPUnit_Framework_MockObject_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/Exception.php',
+    'PHPUnit_Framework_MockObject_Generator' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Generator.php',
+    'PHPUnit_Framework_MockObject_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation.php',
+    'PHPUnit_Framework_MockObject_InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/InvocationMocker.php',
+    'PHPUnit_Framework_MockObject_Invocation_Object' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Object.php',
+    'PHPUnit_Framework_MockObject_Invocation_Static' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invocation/Static.php',
+    'PHPUnit_Framework_MockObject_Invokable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Invokable.php',
+    'PHPUnit_Framework_MockObject_Matcher' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher.php',
+    'PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
+    'PHPUnit_Framework_MockObject_Matcher_AnyParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/AnyParameters.php',
+    'PHPUnit_Framework_MockObject_Matcher_ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
+    'PHPUnit_Framework_MockObject_Matcher_Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Invocation.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedAtIndex' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedAtMostCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedAtMostCount.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedCount.php',
+    'PHPUnit_Framework_MockObject_Matcher_InvokedRecorder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/InvokedRecorder.php',
+    'PHPUnit_Framework_MockObject_Matcher_MethodName' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/MethodName.php',
+    'PHPUnit_Framework_MockObject_Matcher_Parameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/Parameters.php',
+    'PHPUnit_Framework_MockObject_Matcher_StatelessInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Matcher/StatelessInvocation.php',
+    'PHPUnit_Framework_MockObject_MockBuilder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockBuilder.php',
+    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/MockObject.php',
+    'PHPUnit_Framework_MockObject_RuntimeException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Exception/RuntimeException.php',
+    'PHPUnit_Framework_MockObject_Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub.php',
+    'PHPUnit_Framework_MockObject_Stub_ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
+    'PHPUnit_Framework_MockObject_Stub_Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Exception.php',
+    'PHPUnit_Framework_MockObject_Stub_MatcherCollection' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/MatcherCollection.php',
+    'PHPUnit_Framework_MockObject_Stub_Return' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/Return.php',
+    'PHPUnit_Framework_MockObject_Stub_ReturnArgument' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnArgument.php',
+    'PHPUnit_Framework_MockObject_Stub_ReturnCallback' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnCallback.php',
+    'PHPUnit_Framework_MockObject_Stub_ReturnSelf' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnSelf.php',
+    'PHPUnit_Framework_MockObject_Stub_ReturnValueMap' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Stub/ReturnValueMap.php',
+    'PHPUnit_Framework_MockObject_Verifiable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Framework/MockObject/Verifiable.php',
+    'PHPUnit_Framework_OutputError' => $vendorDir . '/phpunit/phpunit/src/Framework/OutputError.php',
+    'PHPUnit_Framework_RiskyTest' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTest.php',
+    'PHPUnit_Framework_RiskyTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
+    'PHPUnit_Framework_SelfDescribing' => $vendorDir . '/phpunit/phpunit/src/Framework/SelfDescribing.php',
+    'PHPUnit_Framework_SkippedTest' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTest.php',
+    'PHPUnit_Framework_SkippedTestCase' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestCase.php',
+    'PHPUnit_Framework_SkippedTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestError.php',
+    'PHPUnit_Framework_SkippedTestSuiteError' => $vendorDir . '/phpunit/phpunit/src/Framework/SkippedTestSuiteError.php',
+    'PHPUnit_Framework_SyntheticError' => $vendorDir . '/phpunit/phpunit/src/Framework/SyntheticError.php',
+    'PHPUnit_Framework_Test' => $vendorDir . '/phpunit/phpunit/src/Framework/Test.php',
+    'PHPUnit_Framework_TestCase' => $vendorDir . '/phpunit/phpunit/src/Framework/TestCase.php',
+    'PHPUnit_Framework_TestFailure' => $vendorDir . '/phpunit/phpunit/src/Framework/TestFailure.php',
+    'PHPUnit_Framework_TestListener' => $vendorDir . '/phpunit/phpunit/src/Framework/TestListener.php',
+    'PHPUnit_Framework_TestResult' => $vendorDir . '/phpunit/phpunit/src/Framework/TestResult.php',
+    'PHPUnit_Framework_TestSuite' => $vendorDir . '/phpunit/phpunit/src/Framework/TestSuite.php',
+    'PHPUnit_Framework_TestSuite_DataProvider' => $vendorDir . '/phpunit/phpunit/src/Framework/TestSuite/DataProvider.php',
+    'PHPUnit_Framework_UnintentionallyCoveredCodeError' => $vendorDir . '/phpunit/phpunit/src/Framework/UnintentionallyCoveredCodeError.php',
+    'PHPUnit_Framework_Warning' => $vendorDir . '/phpunit/phpunit/src/Framework/Warning.php',
+    'PHPUnit_Runner_BaseTestRunner' => $vendorDir . '/phpunit/phpunit/src/Runner/BaseTestRunner.php',
+    'PHPUnit_Runner_Exception' => $vendorDir . '/phpunit/phpunit/src/Runner/Exception.php',
+    'PHPUnit_Runner_Filter_Factory' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Factory.php',
+    'PHPUnit_Runner_Filter_GroupFilterIterator' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Group.php',
+    'PHPUnit_Runner_Filter_Group_Exclude' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Group/Exclude.php',
+    'PHPUnit_Runner_Filter_Group_Include' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Group/Include.php',
+    'PHPUnit_Runner_Filter_Test' => $vendorDir . '/phpunit/phpunit/src/Runner/Filter/Test.php',
+    'PHPUnit_Runner_StandardTestSuiteLoader' => $vendorDir . '/phpunit/phpunit/src/Runner/StandardTestSuiteLoader.php',
+    'PHPUnit_Runner_TestSuiteLoader' => $vendorDir . '/phpunit/phpunit/src/Runner/TestSuiteLoader.php',
+    'PHPUnit_Runner_Version' => $vendorDir . '/phpunit/phpunit/src/Runner/Version.php',
+    'PHPUnit_TextUI_Command' => $vendorDir . '/phpunit/phpunit/src/TextUI/Command.php',
+    'PHPUnit_TextUI_ResultPrinter' => $vendorDir . '/phpunit/phpunit/src/TextUI/ResultPrinter.php',
+    'PHPUnit_TextUI_TestRunner' => $vendorDir . '/phpunit/phpunit/src/TextUI/TestRunner.php',
+    'PHPUnit_Util_Blacklist' => $vendorDir . '/phpunit/phpunit/src/Util/Blacklist.php',
+    'PHPUnit_Util_Configuration' => $vendorDir . '/phpunit/phpunit/src/Util/Configuration.php',
+    'PHPUnit_Util_ErrorHandler' => $vendorDir . '/phpunit/phpunit/src/Util/ErrorHandler.php',
+    'PHPUnit_Util_Fileloader' => $vendorDir . '/phpunit/phpunit/src/Util/Fileloader.php',
+    'PHPUnit_Util_Filesystem' => $vendorDir . '/phpunit/phpunit/src/Util/Filesystem.php',
+    'PHPUnit_Util_Filter' => $vendorDir . '/phpunit/phpunit/src/Util/Filter.php',
+    'PHPUnit_Util_Getopt' => $vendorDir . '/phpunit/phpunit/src/Util/Getopt.php',
+    'PHPUnit_Util_GlobalState' => $vendorDir . '/phpunit/phpunit/src/Util/GlobalState.php',
+    'PHPUnit_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/phpunit/src/Util/InvalidArgumentHelper.php',
+    'PHPUnit_Util_Log_JSON' => $vendorDir . '/phpunit/phpunit/src/Util/Log/JSON.php',
+    'PHPUnit_Util_Log_JUnit' => $vendorDir . '/phpunit/phpunit/src/Util/Log/JUnit.php',
+    'PHPUnit_Util_Log_TAP' => $vendorDir . '/phpunit/phpunit/src/Util/Log/TAP.php',
+    'PHPUnit_Util_PHP' => $vendorDir . '/phpunit/phpunit/src/Util/PHP.php',
+    'PHPUnit_Util_PHP_Default' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/Default.php',
+    'PHPUnit_Util_PHP_Windows' => $vendorDir . '/phpunit/phpunit/src/Util/PHP/Windows.php',
+    'PHPUnit_Util_Printer' => $vendorDir . '/phpunit/phpunit/src/Util/Printer.php',
+    'PHPUnit_Util_Regex' => $vendorDir . '/phpunit/phpunit/src/Util/Regex.php',
+    'PHPUnit_Util_String' => $vendorDir . '/phpunit/phpunit/src/Util/String.php',
+    'PHPUnit_Util_Test' => $vendorDir . '/phpunit/phpunit/src/Util/Test.php',
+    'PHPUnit_Util_TestDox_NamePrettifier' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/NamePrettifier.php',
+    'PHPUnit_Util_TestDox_ResultPrinter' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/ResultPrinter.php',
+    'PHPUnit_Util_TestDox_ResultPrinter_HTML' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/ResultPrinter/HTML.php',
+    'PHPUnit_Util_TestDox_ResultPrinter_Text' => $vendorDir . '/phpunit/phpunit/src/Util/TestDox/ResultPrinter/Text.php',
+    'PHPUnit_Util_TestSuiteIterator' => $vendorDir . '/phpunit/phpunit/src/Util/TestSuiteIterator.php',
+    'PHPUnit_Util_Type' => $vendorDir . '/phpunit/phpunit/src/Util/Type.php',
+    'PHPUnit_Util_XML' => $vendorDir . '/phpunit/phpunit/src/Util/XML.php',
+    'PHP_CodeCoverage' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage.php',
+    'PHP_CodeCoverage_Driver' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver.php',
+    'PHP_CodeCoverage_Driver_HHVM' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver/HHVM.php',
+    'PHP_CodeCoverage_Driver_PHPDBG' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver/PHPDBG.php',
+    'PHP_CodeCoverage_Driver_Xdebug' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Driver/Xdebug.php',
+    'PHP_CodeCoverage_Exception' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Exception.php',
+    'PHP_CodeCoverage_Exception_UnintentionallyCoveredCode' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Exception/UnintentionallyCoveredCode.php',
+    'PHP_CodeCoverage_Filter' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Filter.php',
+    'PHP_CodeCoverage_Report_Clover' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Clover.php',
+    'PHP_CodeCoverage_Report_Crap4j' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Crap4j.php',
+    'PHP_CodeCoverage_Report_Factory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Factory.php',
+    'PHP_CodeCoverage_Report_HTML' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML.php',
+    'PHP_CodeCoverage_Report_HTML_Renderer' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer.php',
+    'PHP_CodeCoverage_Report_HTML_Renderer_Dashboard' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Dashboard.php',
+    'PHP_CodeCoverage_Report_HTML_Renderer_Directory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/Directory.php',
+    'PHP_CodeCoverage_Report_HTML_Renderer_File' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/HTML/Renderer/File.php',
+    'PHP_CodeCoverage_Report_Node' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node.php',
+    'PHP_CodeCoverage_Report_Node_Directory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Directory.php',
+    'PHP_CodeCoverage_Report_Node_File' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/File.php',
+    'PHP_CodeCoverage_Report_Node_Iterator' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Node/Iterator.php',
+    'PHP_CodeCoverage_Report_PHP' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/PHP.php',
+    'PHP_CodeCoverage_Report_Text' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/Text.php',
+    'PHP_CodeCoverage_Report_XML' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML.php',
+    'PHP_CodeCoverage_Report_XML_Directory' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Directory.php',
+    'PHP_CodeCoverage_Report_XML_File' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File.php',
+    'PHP_CodeCoverage_Report_XML_File_Coverage' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Coverage.php',
+    'PHP_CodeCoverage_Report_XML_File_Method' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Method.php',
+    'PHP_CodeCoverage_Report_XML_File_Report' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Report.php',
+    'PHP_CodeCoverage_Report_XML_File_Unit' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/File/Unit.php',
+    'PHP_CodeCoverage_Report_XML_Node' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Node.php',
+    'PHP_CodeCoverage_Report_XML_Project' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Project.php',
+    'PHP_CodeCoverage_Report_XML_Tests' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Tests.php',
+    'PHP_CodeCoverage_Report_XML_Totals' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Report/XML/Totals.php',
+    'PHP_CodeCoverage_Util' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Util.php',
+    'PHP_CodeCoverage_Util_InvalidArgumentHelper' => $vendorDir . '/phpunit/php-code-coverage/src/CodeCoverage/Util/InvalidArgumentHelper.php',
+    'PHP_Timer' => $vendorDir . '/phpunit/php-timer/src/Timer.php',
+    'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_TokenWithScope' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_TokenWithScopeAndVisibility' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ABSTRACT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_AMPERSAND' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_AND_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ARRAY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ARRAY_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_AS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ASYNC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_AT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_AWAIT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_BACKTICK' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_BAD_CHARACTER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_BOOLEAN_AND' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_BOOLEAN_OR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_BOOL_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_BREAK' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CALLABLE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CARET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CASE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CATCH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CHARACTER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CLASS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CLASS_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CLASS_NAME_CONSTANT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CLONE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CLOSE_BRACKET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CLOSE_CURLY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CLOSE_SQUARE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CLOSE_TAG' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_COALESCE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_COLON' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_COMMA' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_COMMENT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_COMPILER_HALT_OFFSET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CONCAT_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CONST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CONSTANT_ENCAPSED_STRING' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CONTINUE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_CURLY_OPEN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DEC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DECLARE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DEFAULT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DIR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DIV' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DIV_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DNUMBER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DO' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DOC_COMMENT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DOLLAR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DOLLAR_OPEN_CURLY_BRACES' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DOT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DOUBLE_ARROW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DOUBLE_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DOUBLE_COLON' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_DOUBLE_QUOTES' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ECHO' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ELLIPSIS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ELSE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ELSEIF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_EMPTY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ENCAPSED_AND_WHITESPACE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ENDDECLARE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ENDFOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ENDFOREACH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ENDIF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ENDSWITCH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ENDWHILE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_END_HEREDOC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ENUM' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_EQUALS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_EVAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_EXCLAMATION_MARK' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_EXIT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_EXTENDS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_FILE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_FINAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_FINALLY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_FOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_FOREACH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_FUNCTION' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_FUNC_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_GLOBAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_GOTO' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_GT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_HALT_COMPILER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_IF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_IMPLEMENTS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_IN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_INC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_INCLUDE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_INCLUDE_ONCE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_INLINE_HTML' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_INSTANCEOF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_INSTEADOF' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_INTERFACE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_INT_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ISSET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_IS_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_IS_GREATER_OR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_IS_IDENTICAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_IS_NOT_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_IS_NOT_IDENTICAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_IS_SMALLER_OR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_Includes' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_JOIN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LAMBDA_ARROW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LAMBDA_CP' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LAMBDA_OP' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LINE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LIST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LNUMBER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LOGICAL_AND' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LOGICAL_OR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LOGICAL_XOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_LT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_METHOD_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_MINUS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_MINUS_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_MOD_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_MULT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_MUL_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_NAMESPACE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_NEW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_NS_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_NS_SEPARATOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_NUM_STRING' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_OBJECT_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_OBJECT_OPERATOR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_ONUMBER' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_OPEN_BRACKET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_OPEN_CURLY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_OPEN_SQUARE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_OPEN_TAG' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_OPEN_TAG_WITH_ECHO' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_OR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_PAAMAYIM_NEKUDOTAYIM' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_PERCENT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_PIPE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_PLUS' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_PLUS_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_POW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_POW_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_PRINT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_PRIVATE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_PROTECTED' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_PUBLIC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_QUESTION_MARK' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_REQUIRE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_REQUIRE_ONCE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_RETURN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_SEMICOLON' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_SHAPE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_SL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_SL_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_SPACESHIP' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_SR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_SR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_START_HEREDOC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_STATIC' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_STRING' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_STRING_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_STRING_VARNAME' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_SWITCH' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_Stream' => $vendorDir . '/phpunit/php-token-stream/src/Token/Stream.php',
+    'PHP_Token_Stream_CachingFactory' => $vendorDir . '/phpunit/php-token-stream/src/Token/Stream/CachingFactory.php',
+    'PHP_Token_THROW' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_TILDE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_TRAIT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_TRAIT_C' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_TRY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_TYPE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_TYPELIST_GT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_TYPELIST_LT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_UNSET' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_UNSET_CAST' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_USE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_VAR' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_VARIABLE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_WHERE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_WHILE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_WHITESPACE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XHP_ATTRIBUTE' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XHP_CATEGORY' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XHP_CATEGORY_LABEL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XHP_CHILDREN' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XHP_LABEL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XHP_REQUIRED' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XHP_TAG_GT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XHP_TAG_LT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XHP_TEXT' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_XOR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_YIELD' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
+    'PHP_Token_YIELD_FROM' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
     'PclZip' => $vendorDir . '/pclzip/pclzip/pclzip.lib.php',
     'QRcode' => $vendorDir . '/tecnick.com/tcpdf/include/barcodes/qrcode.php',
+    'SebastianBergmann\\Comparator\\ArrayComparator' => $vendorDir . '/sebastian/comparator/src/ArrayComparator.php',
+    'SebastianBergmann\\Comparator\\Comparator' => $vendorDir . '/sebastian/comparator/src/Comparator.php',
+    'SebastianBergmann\\Comparator\\ComparisonFailure' => $vendorDir . '/sebastian/comparator/src/ComparisonFailure.php',
+    'SebastianBergmann\\Comparator\\DOMNodeComparator' => $vendorDir . '/sebastian/comparator/src/DOMNodeComparator.php',
+    'SebastianBergmann\\Comparator\\DateTimeComparator' => $vendorDir . '/sebastian/comparator/src/DateTimeComparator.php',
+    'SebastianBergmann\\Comparator\\DoubleComparator' => $vendorDir . '/sebastian/comparator/src/DoubleComparator.php',
+    'SebastianBergmann\\Comparator\\ExceptionComparator' => $vendorDir . '/sebastian/comparator/src/ExceptionComparator.php',
+    'SebastianBergmann\\Comparator\\Factory' => $vendorDir . '/sebastian/comparator/src/Factory.php',
+    'SebastianBergmann\\Comparator\\MockObjectComparator' => $vendorDir . '/sebastian/comparator/src/MockObjectComparator.php',
+    'SebastianBergmann\\Comparator\\NumericComparator' => $vendorDir . '/sebastian/comparator/src/NumericComparator.php',
+    'SebastianBergmann\\Comparator\\ObjectComparator' => $vendorDir . '/sebastian/comparator/src/ObjectComparator.php',
+    'SebastianBergmann\\Comparator\\ResourceComparator' => $vendorDir . '/sebastian/comparator/src/ResourceComparator.php',
+    'SebastianBergmann\\Comparator\\ScalarComparator' => $vendorDir . '/sebastian/comparator/src/ScalarComparator.php',
+    'SebastianBergmann\\Comparator\\SplObjectStorageComparator' => $vendorDir . '/sebastian/comparator/src/SplObjectStorageComparator.php',
+    'SebastianBergmann\\Comparator\\TypeComparator' => $vendorDir . '/sebastian/comparator/src/TypeComparator.php',
+    'SebastianBergmann\\Diff\\Chunk' => $vendorDir . '/sebastian/diff/src/Chunk.php',
+    'SebastianBergmann\\Diff\\Diff' => $vendorDir . '/sebastian/diff/src/Diff.php',
+    'SebastianBergmann\\Diff\\Differ' => $vendorDir . '/sebastian/diff/src/Differ.php',
+    'SebastianBergmann\\Diff\\LCS\\LongestCommonSubsequence' => $vendorDir . '/sebastian/diff/src/LCS/LongestCommonSubsequence.php',
+    'SebastianBergmann\\Diff\\LCS\\MemoryEfficientImplementation' => $vendorDir . '/sebastian/diff/src/LCS/MemoryEfficientLongestCommonSubsequenceImplementation.php',
+    'SebastianBergmann\\Diff\\LCS\\TimeEfficientImplementation' => $vendorDir . '/sebastian/diff/src/LCS/TimeEfficientLongestCommonSubsequenceImplementation.php',
+    'SebastianBergmann\\Diff\\Line' => $vendorDir . '/sebastian/diff/src/Line.php',
+    'SebastianBergmann\\Diff\\Parser' => $vendorDir . '/sebastian/diff/src/Parser.php',
+    'SebastianBergmann\\Environment\\Console' => $vendorDir . '/sebastian/environment/src/Console.php',
+    'SebastianBergmann\\Environment\\Runtime' => $vendorDir . '/sebastian/environment/src/Runtime.php',
+    'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php',
+    'SebastianBergmann\\GlobalState\\Blacklist' => $vendorDir . '/sebastian/global-state/src/Blacklist.php',
+    'SebastianBergmann\\GlobalState\\Exception' => $vendorDir . '/sebastian/global-state/src/Exception.php',
+    'SebastianBergmann\\GlobalState\\Restorer' => $vendorDir . '/sebastian/global-state/src/Restorer.php',
+    'SebastianBergmann\\GlobalState\\RuntimeException' => $vendorDir . '/sebastian/global-state/src/RuntimeException.php',
+    'SebastianBergmann\\GlobalState\\Snapshot' => $vendorDir . '/sebastian/global-state/src/Snapshot.php',
+    'SebastianBergmann\\RecursionContext\\Context' => $vendorDir . '/sebastian/recursion-context/src/Context.php',
+    'SebastianBergmann\\RecursionContext\\Exception' => $vendorDir . '/sebastian/recursion-context/src/Exception.php',
+    'SebastianBergmann\\RecursionContext\\InvalidArgumentException' => $vendorDir . '/sebastian/recursion-context/src/InvalidArgumentException.php',
+    'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
     'TCPDF' => $vendorDir . '/tecnick.com/tcpdf/tcpdf.php',
     'TCPDF2DBarcode' => $vendorDir . '/tecnick.com/tcpdf/tcpdf_barcodes_2d.php',
     'TCPDFBarcode' => $vendorDir . '/tecnick.com/tcpdf/tcpdf_barcodes_1d.php',
@@ -22,4 +523,5 @@ return array(
     'TCPDF_IMPORT' => $vendorDir . '/tecnick.com/tcpdf/tcpdf_import.php',
     'TCPDF_PARSER' => $vendorDir . '/tecnick.com/tcpdf/tcpdf_parser.php',
     'TCPDF_STATIC' => $vendorDir . '/tecnick.com/tcpdf/include/tcpdf_static.php',
+    'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php',
 );
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 5645a52f0d..38e2398b0c 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    $vendorDir . '/hamcrest/hamcrest-php/hamcrest/Hamcrest.php',
     $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php',
     $vendorDir . '/ircmaxell/password-compat/lib/password.php',
 );
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index 387fc5ff51..4db106b52f 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -6,7 +6,15 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'phpDocumentor' => array($vendorDir . '/phpdocumentor/reflection-docblock/src'),
     'Zend_' => array($vendorDir . '/bombayworks/zendframework1/library'),
+    'Psr\\Log\\' => array($vendorDir . '/psr/log'),
+    'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'),
+    'Mockery' => array($vendorDir . '/mockery/mockery/library'),
     'Michelf' => array($vendorDir . '/michelf/php-markdown'),
     'HTMLPurifier' => array($vendorDir . '/ezyang/htmlpurifier/library'),
+    'Guzzle\\Tests' => array($vendorDir . '/guzzle/guzzle/tests'),
+    'Guzzle' => array($vendorDir . '/guzzle/guzzle/src'),
+    'Contrib\\Component' => array($vendorDir . '/satooshi/php-coveralls/src'),
+    'Contrib\\Bundle' => array($vendorDir . '/satooshi/php-coveralls/src'),
 );
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 3023fb645c..f83cf194d6 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -6,10 +6,17 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
+    'Symfony\\Component\\Stopwatch\\' => array($vendorDir . '/symfony/stopwatch'),
+    'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
+    'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
+    'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
+    'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
     'Rhumsaa\\Uuid\\' => array($vendorDir . '/ramsey/uuid/src'),
     'Patchwork\\' => array($vendorDir . '/patchwork/utf8/src/Patchwork'),
     'Fisharebest\\Webtrees\\' => array($baseDir . '/app'),
     'Fisharebest\\Localization\\' => array($vendorDir . '/fisharebest/localization/src'),
     'Fisharebest\\ExtCalendar\\' => array($vendorDir . '/fisharebest/ext-calendar/src'),
     'Fisharebest\\Algorithm\\' => array($vendorDir . '/fisharebest/algorithm/src'),
+    'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
 );
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 191bf75b9f..d71ffea3ff 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -39,62 +39,6 @@
         ]
     },
     {
-        "name": "bombayworks/zendframework1",
-        "version": "v1.12.15",
-        "version_normalized": "1.12.15.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/bombayworks/zendframework1.git",
-            "reference": "a9cf9083eda9c2df8ae88b51f83d48347fef9d30"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/a9cf9083eda9c2df8ae88b51f83d48347fef9d30",
-            "reference": "a9cf9083eda9c2df8ae88b51f83d48347fef9d30",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2.11"
-        },
-        "replace": {
-            "zendframework/zendframework1": "self.version"
-        },
-        "require-dev": {
-            "phpunit/dbunit": "1.3.*",
-            "phpunit/phpunit": "3.7.*"
-        },
-        "time": "2015-08-11 16:00:07",
-        "bin": [
-            "bin/zf.sh",
-            "bin/zf.php"
-        ],
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.12.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Zend_": "library/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "include-path": [
-            "library/"
-        ],
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "description": "Zend Framework 1",
-        "homepage": "http://framework.zend.com/",
-        "keywords": [
-            "ZF1",
-            "framework"
-        ]
-    },
-    {
         "name": "ezyang/htmlpurifier",
         "version": "v4.7.0",
         "version_normalized": "4.7.0.0",
@@ -189,66 +133,6 @@
         ]
     },
     {
-        "name": "fisharebest/ext-calendar",
-        "version": "2.1.0",
-        "version_normalized": "2.1.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/fisharebest/ext-calendar.git",
-            "reference": "e34274eb932db010369ebe8c76c6b6a6a2ad14c5"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/fisharebest/ext-calendar/zipball/e34274eb932db010369ebe8c76c6b6a6a2ad14c5",
-            "reference": "e34274eb932db010369ebe8c76c6b6a6a2ad14c5",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "*",
-            "satooshi/php-coveralls": "*"
-        },
-        "time": "2015-04-02 20:40:10",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Fisharebest\\ExtCalendar\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "GPL-3.0+"
-        ],
-        "authors": [
-            {
-                "name": "Greg Roach",
-                "email": "fisharebest@gmail.com",
-                "role": "Developer"
-            }
-        ],
-        "description": "Implementation of the Arabic (Hijri), French, Gregorian, Jewish, Julian and Persian (Jalali) calendars.  Optional PHP shims for servers without the ext/calendar extension.",
-        "homepage": "https://github.com/fisharebest/ext-calendar",
-        "keywords": [
-            "Jalali",
-            "arabic",
-            "calendar",
-            "ext-calendar",
-            "french",
-            "gregorian",
-            "hebrew",
-            "hijri",
-            "jewish",
-            "julian",
-            "julian day",
-            "julian day number",
-            "persian",
-            "shamsi"
-        ]
-    },
-    {
         "name": "ircmaxell/password-compat",
         "version": "v1.0.4",
         "version_normalized": "1.0.4.0",
@@ -594,5 +478,1702 @@
             "identifier",
             "uuid"
         ]
+    },
+    {
+        "name": "bombayworks/zendframework1",
+        "version": "v1.12.16",
+        "version_normalized": "1.12.16.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/bombayworks/zendframework1.git",
+            "reference": "0b71c0311a1f5734e14751755aa7f7c4736b2892"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/bombayworks/zendframework1/zipball/0b71c0311a1f5734e14751755aa7f7c4736b2892",
+            "reference": "0b71c0311a1f5734e14751755aa7f7c4736b2892",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2.11"
+        },
+        "replace": {
+            "zendframework/zendframework1": "self.version"
+        },
+        "require-dev": {
+            "phpunit/dbunit": "1.3.*",
+            "phpunit/phpunit": "3.7.*"
+        },
+        "time": "2015-09-15 16:00:12",
+        "bin": [
+            "bin/zf.sh",
+            "bin/zf.php"
+        ],
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.12.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Zend_": "library/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "include-path": [
+            "library/"
+        ],
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "description": "Zend Framework 1",
+        "homepage": "http://framework.zend.com/",
+        "keywords": [
+            "ZF1",
+            "framework"
+        ]
+    },
+    {
+        "name": "fisharebest/ext-calendar",
+        "version": "2.1.1",
+        "version_normalized": "2.1.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/fisharebest/ext-calendar.git",
+            "reference": "4ad4547f91073c4266274c5375bcca981e1e98ec"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/fisharebest/ext-calendar/zipball/4ad4547f91073c4266274c5375bcca981e1e98ec",
+            "reference": "4ad4547f91073c4266274c5375bcca981e1e98ec",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "*",
+            "satooshi/php-coveralls": "*"
+        },
+        "time": "2015-09-21 15:12:48",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Fisharebest\\ExtCalendar\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-3.0+"
+        ],
+        "authors": [
+            {
+                "name": "Greg Roach",
+                "email": "fisharebest@gmail.com",
+                "role": "Developer"
+            }
+        ],
+        "description": "Implementation of the Arabic (Hijri), French, Gregorian, Jewish, Julian and Persian (Jalali) calendars.  Optional PHP shims for servers without the ext/calendar extension.",
+        "homepage": "https://github.com/fisharebest/ext-calendar",
+        "keywords": [
+            "Jalali",
+            "arabic",
+            "calendar",
+            "ext-calendar",
+            "french",
+            "gregorian",
+            "hebrew",
+            "hijri",
+            "jewish",
+            "julian",
+            "julian day",
+            "julian day number",
+            "persian",
+            "shamsi"
+        ]
+    },
+    {
+        "name": "hamcrest/hamcrest-php",
+        "version": "v1.2.2",
+        "version_normalized": "1.2.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/hamcrest/hamcrest-php.git",
+            "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/b37020aa976fa52d3de9aa904aa2522dc518f79c",
+            "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.2"
+        },
+        "replace": {
+            "cordoval/hamcrest-php": "*",
+            "davedevelopment/hamcrest-php": "*",
+            "kodova/hamcrest-php": "*"
+        },
+        "require-dev": {
+            "phpunit/php-file-iterator": "1.3.3",
+            "satooshi/php-coveralls": "dev-master"
+        },
+        "time": "2015-05-11 14:41:42",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "hamcrest"
+            ],
+            "files": [
+                "hamcrest/Hamcrest.php"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD"
+        ],
+        "description": "This is the PHP port of Hamcrest Matchers",
+        "keywords": [
+            "test"
+        ]
+    },
+    {
+        "name": "mockery/mockery",
+        "version": "0.9.4",
+        "version_normalized": "0.9.4.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/padraic/mockery.git",
+            "reference": "70bba85e4aabc9449626651f48b9018ede04f86b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/padraic/mockery/zipball/70bba85e4aabc9449626651f48b9018ede04f86b",
+            "reference": "70bba85e4aabc9449626651f48b9018ede04f86b",
+            "shasum": ""
+        },
+        "require": {
+            "hamcrest/hamcrest-php": "~1.1",
+            "lib-pcre": ">=7.0",
+            "php": ">=5.3.2"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.0"
+        },
+        "time": "2015-04-02 19:54:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "0.9.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Mockery": "library/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Pádraic Brady",
+                "email": "padraic.brady@gmail.com",
+                "homepage": "http://blog.astrumfutura.com"
+            },
+            {
+                "name": "Dave Marshall",
+                "email": "dave.marshall@atstsolutions.co.uk",
+                "homepage": "http://davedevelopment.co.uk"
+            }
+        ],
+        "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
+        "homepage": "http://github.com/padraic/mockery",
+        "keywords": [
+            "BDD",
+            "TDD",
+            "library",
+            "mock",
+            "mock objects",
+            "mockery",
+            "stub",
+            "test",
+            "test double",
+            "testing"
+        ]
+    },
+    {
+        "name": "sebastian/version",
+        "version": "1.0.6",
+        "version_normalized": "1.0.6.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/version.git",
+            "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+            "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+            "shasum": ""
+        },
+        "time": "2015-06-21 13:59:46",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
+            }
+        ],
+        "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+        "homepage": "https://github.com/sebastianbergmann/version"
+    },
+    {
+        "name": "sebastian/global-state",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/global-state.git",
+            "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+            "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.2"
+        },
+        "suggest": {
+            "ext-uopz": "*"
+        },
+        "time": "2014-10-06 09:23:50",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de"
+            }
+        ],
+        "description": "Snapshotting of global state",
+        "homepage": "http://www.github.com/sebastianbergmann/global-state",
+        "keywords": [
+            "global state"
+        ]
+    },
+    {
+        "name": "sebastian/recursion-context",
+        "version": "1.0.1",
+        "version_normalized": "1.0.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/recursion-context.git",
+            "reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
+            "reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.4"
+        },
+        "time": "2015-06-21 08:04:50",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Jeff Welch",
+                "email": "whatthejeff@gmail.com"
+            },
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de"
+            },
+            {
+                "name": "Adam Harvey",
+                "email": "aharvey@php.net"
+            }
+        ],
+        "description": "Provides functionality to recursively process PHP variables",
+        "homepage": "http://www.github.com/sebastianbergmann/recursion-context"
+    },
+    {
+        "name": "sebastian/exporter",
+        "version": "1.2.1",
+        "version_normalized": "1.2.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/exporter.git",
+            "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
+            "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3",
+            "sebastian/recursion-context": "~1.0"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.4"
+        },
+        "time": "2015-06-21 07:55:53",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.2.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Jeff Welch",
+                "email": "whatthejeff@gmail.com"
+            },
+            {
+                "name": "Volker Dusch",
+                "email": "github@wallbash.com"
+            },
+            {
+                "name": "Bernhard Schussek",
+                "email": "bschussek@2bepublished.at"
+            },
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de"
+            },
+            {
+                "name": "Adam Harvey",
+                "email": "aharvey@php.net"
+            }
+        ],
+        "description": "Provides the functionality to export PHP variables for visualization",
+        "homepage": "http://www.github.com/sebastianbergmann/exporter",
+        "keywords": [
+            "export",
+            "exporter"
+        ]
+    },
+    {
+        "name": "sebastian/environment",
+        "version": "1.3.2",
+        "version_normalized": "1.3.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/environment.git",
+            "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
+            "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.4"
+        },
+        "time": "2015-08-03 06:14:51",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.3.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de"
+            }
+        ],
+        "description": "Provides functionality to handle HHVM/PHP environments",
+        "homepage": "http://www.github.com/sebastianbergmann/environment",
+        "keywords": [
+            "Xdebug",
+            "environment",
+            "hhvm"
+        ]
+    },
+    {
+        "name": "sebastian/diff",
+        "version": "1.3.0",
+        "version_normalized": "1.3.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/diff.git",
+            "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
+            "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.2"
+        },
+        "time": "2015-02-22 15:13:53",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.3-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Kore Nordmann",
+                "email": "mail@kore-nordmann.de"
+            },
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de"
+            }
+        ],
+        "description": "Diff implementation",
+        "homepage": "http://www.github.com/sebastianbergmann/diff",
+        "keywords": [
+            "diff"
+        ]
+    },
+    {
+        "name": "sebastian/comparator",
+        "version": "1.2.0",
+        "version_normalized": "1.2.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/comparator.git",
+            "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+            "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3",
+            "sebastian/diff": "~1.2",
+            "sebastian/exporter": "~1.2"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.4"
+        },
+        "time": "2015-07-26 15:48:44",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.2.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Jeff Welch",
+                "email": "whatthejeff@gmail.com"
+            },
+            {
+                "name": "Volker Dusch",
+                "email": "github@wallbash.com"
+            },
+            {
+                "name": "Bernhard Schussek",
+                "email": "bschussek@2bepublished.at"
+            },
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de"
+            }
+        ],
+        "description": "Provides the functionality to compare PHP values for equality",
+        "homepage": "http://www.github.com/sebastianbergmann/comparator",
+        "keywords": [
+            "comparator",
+            "compare",
+            "equality"
+        ]
+    },
+    {
+        "name": "doctrine/instantiator",
+        "version": "1.0.5",
+        "version_normalized": "1.0.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/doctrine/instantiator.git",
+            "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+            "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3,<8.0-DEV"
+        },
+        "require-dev": {
+            "athletic/athletic": "~0.1.8",
+            "ext-pdo": "*",
+            "ext-phar": "*",
+            "phpunit/phpunit": "~4.0",
+            "squizlabs/php_codesniffer": "~2.0"
+        },
+        "time": "2015-06-14 21:17:01",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Marco Pivetta",
+                "email": "ocramius@gmail.com",
+                "homepage": "http://ocramius.github.com/"
+            }
+        ],
+        "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+        "homepage": "https://github.com/doctrine/instantiator",
+        "keywords": [
+            "constructor",
+            "instantiate"
+        ]
+    },
+    {
+        "name": "phpdocumentor/reflection-docblock",
+        "version": "2.0.4",
+        "version_normalized": "2.0.4.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+            "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+            "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.0"
+        },
+        "suggest": {
+            "dflydev/markdown": "~1.0",
+            "erusev/parsedown": "~1.0"
+        },
+        "time": "2015-02-03 12:10:50",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "phpDocumentor": [
+                    "src/"
+                ]
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Mike van Riel",
+                "email": "mike.vanriel@naenius.com"
+            }
+        ]
+    },
+    {
+        "name": "phpspec/prophecy",
+        "version": "v1.5.0",
+        "version_normalized": "1.5.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/phpspec/prophecy.git",
+            "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+            "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+            "shasum": ""
+        },
+        "require": {
+            "doctrine/instantiator": "^1.0.2",
+            "phpdocumentor/reflection-docblock": "~2.0",
+            "sebastian/comparator": "~1.1"
+        },
+        "require-dev": {
+            "phpspec/phpspec": "~2.0"
+        },
+        "time": "2015-08-13 10:07:40",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.4.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Prophecy\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Konstantin Kudryashov",
+                "email": "ever.zet@gmail.com",
+                "homepage": "http://everzet.com"
+            },
+            {
+                "name": "Marcello Duarte",
+                "email": "marcello.duarte@gmail.com"
+            }
+        ],
+        "description": "Highly opinionated mocking framework for PHP 5.3+",
+        "homepage": "https://github.com/phpspec/prophecy",
+        "keywords": [
+            "Double",
+            "Dummy",
+            "fake",
+            "mock",
+            "spy",
+            "stub"
+        ]
+    },
+    {
+        "name": "phpunit/php-text-template",
+        "version": "1.2.1",
+        "version_normalized": "1.2.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/php-text-template.git",
+            "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+            "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "time": "2015-06-21 13:50:34",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
+            }
+        ],
+        "description": "Simple template engine.",
+        "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+        "keywords": [
+            "template"
+        ]
+    },
+    {
+        "name": "phpunit/phpunit-mock-objects",
+        "version": "2.3.7",
+        "version_normalized": "2.3.7.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+            "reference": "5e2645ad49d196e020b85598d7c97e482725786a"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5e2645ad49d196e020b85598d7c97e482725786a",
+            "reference": "5e2645ad49d196e020b85598d7c97e482725786a",
+            "shasum": ""
+        },
+        "require": {
+            "doctrine/instantiator": "^1.0.2",
+            "php": ">=5.3.3",
+            "phpunit/php-text-template": "~1.2",
+            "sebastian/exporter": "~1.2"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.4"
+        },
+        "suggest": {
+            "ext-soap": "*"
+        },
+        "time": "2015-08-19 09:14:08",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.3.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
+            }
+        ],
+        "description": "Mock Object library for PHPUnit",
+        "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+        "keywords": [
+            "mock",
+            "xunit"
+        ]
+    },
+    {
+        "name": "phpunit/php-timer",
+        "version": "1.0.7",
+        "version_normalized": "1.0.7.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/php-timer.git",
+            "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+            "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "time": "2015-06-21 08:01:12",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
+            }
+        ],
+        "description": "Utility class for timing",
+        "homepage": "https://github.com/sebastianbergmann/php-timer/",
+        "keywords": [
+            "timer"
+        ]
+    },
+    {
+        "name": "phpunit/php-token-stream",
+        "version": "1.4.8",
+        "version_normalized": "1.4.8.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+            "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+            "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+            "shasum": ""
+        },
+        "require": {
+            "ext-tokenizer": "*",
+            "php": ">=5.3.3"
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.2"
+        },
+        "time": "2015-09-15 10:49:45",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.4-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de"
+            }
+        ],
+        "description": "Wrapper around PHP's tokenizer extension.",
+        "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+        "keywords": [
+            "tokenizer"
+        ]
+    },
+    {
+        "name": "phpunit/php-file-iterator",
+        "version": "1.4.1",
+        "version_normalized": "1.4.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+            "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+            "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3"
+        },
+        "time": "2015-06-21 13:08:43",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.4.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
+            }
+        ],
+        "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+        "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+        "keywords": [
+            "filesystem",
+            "iterator"
+        ]
+    },
+    {
+        "name": "phpunit/php-code-coverage",
+        "version": "2.2.3",
+        "version_normalized": "2.2.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+            "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef1ca6835468857944d5c3b48fa503d5554cff2f",
+            "reference": "ef1ca6835468857944d5c3b48fa503d5554cff2f",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.3",
+            "phpunit/php-file-iterator": "~1.3",
+            "phpunit/php-text-template": "~1.2",
+            "phpunit/php-token-stream": "~1.3",
+            "sebastian/environment": "^1.3.2",
+            "sebastian/version": "~1.0"
+        },
+        "require-dev": {
+            "ext-xdebug": ">=2.1.4",
+            "phpunit/phpunit": "~4"
+        },
+        "suggest": {
+            "ext-dom": "*",
+            "ext-xdebug": ">=2.2.1",
+            "ext-xmlwriter": "*"
+        },
+        "time": "2015-09-14 06:51:16",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.2.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sb@sebastian-bergmann.de",
+                "role": "lead"
+            }
+        ],
+        "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+        "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+        "keywords": [
+            "coverage",
+            "testing",
+            "xunit"
+        ]
+    },
+    {
+        "name": "phpunit/phpunit",
+        "version": "4.8.9",
+        "version_normalized": "4.8.9.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/sebastianbergmann/phpunit.git",
+            "reference": "73fad41adb5b7bc3a494bb930d90648df1d5e74b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/73fad41adb5b7bc3a494bb930d90648df1d5e74b",
+            "reference": "73fad41adb5b7bc3a494bb930d90648df1d5e74b",
+            "shasum": ""
+        },
+        "require": {
+            "ext-dom": "*",
+            "ext-json": "*",
+            "ext-pcre": "*",
+            "ext-reflection": "*",
+            "ext-spl": "*",
+            "php": ">=5.3.3",
+            "phpspec/prophecy": "^1.3.1",
+            "phpunit/php-code-coverage": "~2.1",
+            "phpunit/php-file-iterator": "~1.4",
+            "phpunit/php-text-template": "~1.2",
+            "phpunit/php-timer": ">=1.0.6",
+            "phpunit/phpunit-mock-objects": "~2.3",
+            "sebastian/comparator": "~1.1",
+            "sebastian/diff": "~1.2",
+            "sebastian/environment": "~1.3",
+            "sebastian/exporter": "~1.2",
+            "sebastian/global-state": "~1.0",
+            "sebastian/version": "~1.0",
+            "symfony/yaml": "~2.1|~3.0"
+        },
+        "suggest": {
+            "phpunit/php-invoker": "~1.1"
+        },
+        "time": "2015-09-20 12:56:44",
+        "bin": [
+            "phpunit"
+        ],
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "4.8.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "BSD-3-Clause"
+        ],
+        "authors": [
+            {
+                "name": "Sebastian Bergmann",
+                "email": "sebastian@phpunit.de",
+                "role": "lead"
+            }
+        ],
+        "description": "The PHP Unit Testing framework.",
+        "homepage": "https://phpunit.de/",
+        "keywords": [
+            "phpunit",
+            "testing",
+            "xunit"
+        ]
+    },
+    {
+        "name": "psr/log",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/php-fig/log.git",
+            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
+            "shasum": ""
+        },
+        "time": "2012-12-21 11:40:51",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Psr\\Log\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interface for logging libraries",
+        "keywords": [
+            "log",
+            "psr",
+            "psr-3"
+        ]
+    },
+    {
+        "name": "symfony/event-dispatcher",
+        "version": "v2.7.5",
+        "version_normalized": "2.7.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/event-dispatcher.git",
+            "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
+            "reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "psr/log": "~1.0",
+            "symfony/config": "~2.0,>=2.0.5",
+            "symfony/dependency-injection": "~2.6",
+            "symfony/expression-language": "~2.6",
+            "symfony/phpunit-bridge": "~2.7",
+            "symfony/stopwatch": "~2.3"
+        },
+        "suggest": {
+            "symfony/dependency-injection": "",
+            "symfony/http-kernel": ""
+        },
+        "time": "2015-09-22 13:49:29",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.7-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\EventDispatcher\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony EventDispatcher Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "guzzle/guzzle",
+        "version": "v3.9.3",
+        "version_normalized": "3.9.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/guzzle/guzzle3.git",
+            "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9",
+            "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9",
+            "shasum": ""
+        },
+        "require": {
+            "ext-curl": "*",
+            "php": ">=5.3.3",
+            "symfony/event-dispatcher": "~2.1"
+        },
+        "replace": {
+            "guzzle/batch": "self.version",
+            "guzzle/cache": "self.version",
+            "guzzle/common": "self.version",
+            "guzzle/http": "self.version",
+            "guzzle/inflection": "self.version",
+            "guzzle/iterator": "self.version",
+            "guzzle/log": "self.version",
+            "guzzle/parser": "self.version",
+            "guzzle/plugin": "self.version",
+            "guzzle/plugin-async": "self.version",
+            "guzzle/plugin-backoff": "self.version",
+            "guzzle/plugin-cache": "self.version",
+            "guzzle/plugin-cookie": "self.version",
+            "guzzle/plugin-curlauth": "self.version",
+            "guzzle/plugin-error-response": "self.version",
+            "guzzle/plugin-history": "self.version",
+            "guzzle/plugin-log": "self.version",
+            "guzzle/plugin-md5": "self.version",
+            "guzzle/plugin-mock": "self.version",
+            "guzzle/plugin-oauth": "self.version",
+            "guzzle/service": "self.version",
+            "guzzle/stream": "self.version"
+        },
+        "require-dev": {
+            "doctrine/cache": "~1.3",
+            "monolog/monolog": "~1.0",
+            "phpunit/phpunit": "3.7.*",
+            "psr/log": "~1.0",
+            "symfony/class-loader": "~2.1",
+            "zendframework/zend-cache": "2.*,<2.3",
+            "zendframework/zend-log": "2.*,<2.3"
+        },
+        "suggest": {
+            "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated."
+        },
+        "time": "2015-03-18 18:23:50",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.9-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Guzzle": "src/",
+                "Guzzle\\Tests": "tests/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Michael Dowling",
+                "email": "mtdowling@gmail.com",
+                "homepage": "https://github.com/mtdowling"
+            },
+            {
+                "name": "Guzzle Community",
+                "homepage": "https://github.com/guzzle/guzzle/contributors"
+            }
+        ],
+        "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle",
+        "homepage": "http://guzzlephp.org/",
+        "keywords": [
+            "client",
+            "curl",
+            "framework",
+            "http",
+            "http client",
+            "rest",
+            "web service"
+        ]
+    },
+    {
+        "name": "symfony/stopwatch",
+        "version": "v2.7.5",
+        "version_normalized": "2.7.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/stopwatch.git",
+            "reference": "08dd97b3f22ab9ee658cd16e6758f8c3c404336e"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/stopwatch/zipball/08dd97b3f22ab9ee658cd16e6758f8c3c404336e",
+            "reference": "08dd97b3f22ab9ee658cd16e6758f8c3c404336e",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "symfony/phpunit-bridge": "~2.7"
+        },
+        "time": "2015-09-22 13:49:29",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.7-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Stopwatch\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Stopwatch Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/filesystem",
+        "version": "v2.7.5",
+        "version_normalized": "2.7.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/filesystem.git",
+            "reference": "a17f8a17c20e8614c15b8e116e2f4bcde102cfab"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/filesystem/zipball/a17f8a17c20e8614c15b8e116e2f4bcde102cfab",
+            "reference": "a17f8a17c20e8614c15b8e116e2f4bcde102cfab",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "symfony/phpunit-bridge": "~2.7"
+        },
+        "time": "2015-09-09 17:42:36",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.7-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Filesystem\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Filesystem Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/config",
+        "version": "v2.7.5",
+        "version_normalized": "2.7.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/config.git",
+            "reference": "9698fdf0a750d6887d5e7729d5cf099765b20e61"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/config/zipball/9698fdf0a750d6887d5e7729d5cf099765b20e61",
+            "reference": "9698fdf0a750d6887d5e7729d5cf099765b20e61",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9",
+            "symfony/filesystem": "~2.3"
+        },
+        "require-dev": {
+            "symfony/phpunit-bridge": "~2.7"
+        },
+        "time": "2015-09-21 15:02:29",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.7-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Config\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Config Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/console",
+        "version": "v2.7.5",
+        "version_normalized": "2.7.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/console.git",
+            "reference": "06cb17c013a82f94a3d840682b49425cd00a2161"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/console/zipball/06cb17c013a82f94a3d840682b49425cd00a2161",
+            "reference": "06cb17c013a82f94a3d840682b49425cd00a2161",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "psr/log": "~1.0",
+            "symfony/event-dispatcher": "~2.1",
+            "symfony/phpunit-bridge": "~2.7",
+            "symfony/process": "~2.1"
+        },
+        "suggest": {
+            "psr/log": "For using the console logger",
+            "symfony/event-dispatcher": "",
+            "symfony/process": ""
+        },
+        "time": "2015-09-25 08:32:23",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.7-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Console\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Console Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "symfony/yaml",
+        "version": "v2.7.5",
+        "version_normalized": "2.7.5.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/symfony/yaml.git",
+            "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+            "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.9"
+        },
+        "require-dev": {
+            "symfony/phpunit-bridge": "~2.7"
+        },
+        "time": "2015-09-14 14:14:09",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "2.7-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Symfony\\Component\\Yaml\\": ""
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            },
+            {
+                "name": "Symfony Community",
+                "homepage": "https://symfony.com/contributors"
+            }
+        ],
+        "description": "Symfony Yaml Component",
+        "homepage": "https://symfony.com"
+    },
+    {
+        "name": "satooshi/php-coveralls",
+        "version": "v0.6.1",
+        "version_normalized": "0.6.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/satooshi/php-coveralls.git",
+            "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/dd0df95bd37a7cf5c5c50304dfe260ffe4b50760",
+            "reference": "dd0df95bd37a7cf5c5c50304dfe260ffe4b50760",
+            "shasum": ""
+        },
+        "require": {
+            "ext-curl": "*",
+            "ext-json": "*",
+            "ext-simplexml": "*",
+            "guzzle/guzzle": ">=3.0",
+            "php": ">=5.3",
+            "psr/log": "1.0.0",
+            "symfony/config": ">=2.0",
+            "symfony/console": ">=2.0",
+            "symfony/stopwatch": ">=2.2",
+            "symfony/yaml": ">=2.0"
+        },
+        "require-dev": {
+            "apigen/apigen": "2.8.*@stable",
+            "pdepend/pdepend": "dev-master",
+            "phpmd/phpmd": "dev-master",
+            "phpunit/php-invoker": ">=1.1.0,<1.2.0",
+            "phpunit/phpunit": "3.7.*@stable",
+            "sebastian/finder-facade": "dev-master",
+            "sebastian/phpcpd": "1.4.*@stable",
+            "squizlabs/php_codesniffer": "1.4.*@stable",
+            "theseer/fdomdocument": "dev-master"
+        },
+        "time": "2013-05-04 08:07:33",
+        "bin": [
+            "composer/bin/coveralls"
+        ],
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Contrib\\Component": "src/",
+                "Contrib\\Bundle": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Kitamura Satoshi",
+                "email": "with.no.parachute@gmail.com",
+                "homepage": "https://www.facebook.com/satooshi.jp"
+            }
+        ],
+        "description": "PHP client library for Coveralls API",
+        "homepage": "https://github.com/satooshi/php-coveralls",
+        "keywords": [
+            "ci",
+            "coverage",
+            "github",
+            "test"
+        ]
     }
 ]
diff --git a/vendor/fisharebest/ext-calendar/CHANGELOG.md b/vendor/fisharebest/ext-calendar/CHANGELOG.md
index 7a41ce6041..13ab3447cf 100644
--- a/vendor/fisharebest/ext-calendar/CHANGELOG.md
+++ b/vendor/fisharebest/ext-calendar/CHANGELOG.md
@@ -1,6 +1,9 @@
 CHANGE LOG
 ==========
 
+## 2.1.1 (2015-09-21)
+ - Test against PHP 7.0
+
 ## 2.1.0 (2015-04-02)
  - Add JewishCalendar::numberToHebrewNumerals() to format Jewish dates