PHP 5.3 compatibility

124 files changed, 2845 insertions, 1165 deletions

diff --git a/.travis.yml b/.travis.yml
index e8768b93d8..b735dd727e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,13 +4,15 @@ php:
   - 7.0
   - 5.6
   - 5.5
+  - 5.4
+  - 5.3
   - hhvm
 
 sudo: false
 
 before_script:
   - composer self-update
-  - composer update --no-interaction
+  - composer install --no-interaction
 
 script:
   - phpunit --coverage-clover tests/clover.xml
diff --git a/app/I18N.php b/app/I18N.php
index b518c6bcf1..54a29b8897 100644
--- a/app/I18N.php
+++ b/app/I18N.php
@@ -352,6 +352,8 @@ class I18N {
 	public static function init($code = null) {
 		global $WT_TREE;
 
+		mb_internal_encoding('UTF-8');
+
 		if ($code !== null) {
 			// Create the specified locale
 			self::$locale = Locale::create($code);
@@ -678,7 +680,7 @@ class I18N {
 	 */
 	public static function strtolower($string) {
 		if (self::$locale->language()->code() === 'tr' || self::$locale->language()->code() === 'az') {
-			$string = strtr($string, ['I' => 'ı', 'İ' => 'i']);
+			$string = strtr($string, array('I' => 'ı', 'İ' => 'i'));
 		}
 
 		return mb_strtolower($string);
@@ -695,7 +697,7 @@ class I18N {
 	 */
 	public static function strtoupper($string) {
 		if (self::$locale->language()->code() === 'tr' || self::$locale->language()->code() === 'az') {
-			$string = strtr($string, ['ı' => 'I', 'i' => 'İ']);
+			$string = strtr($string, array('ı' => 'I', 'i' => 'İ'));
 		}
 
 		return mb_strtoupper($string);
diff --git a/composer.json b/composer.json
index 55765705f0..96229553d7 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
 		"fabpot/php-cs-fixer": "*",
 		"mockery/mockery": "*",
 		"phpunit/phpunit": "*",
-		"satooshi/php-coveralls": "dev-master"
+		"satooshi/php-coveralls": "~1.0"
 	},
 	"extra": {
 		"branch-alias": {
diff --git a/composer.lock b/composer.lock
index 5371bf3713..b916a6e110 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "8b201c8d0b76b5bb1bf0181a015456ad",
-    "content-hash": "b6adcc163b5722648ffbb28673ed9b83",
+    "hash": "58098a493195adb164e3028ce3f9bb4f",
+    "content-hash": "19a59c8aebc19340772eae31362a9a87",
     "packages": [
         {
             "name": "bombayworks/zendframework1",
@@ -827,12 +827,1688 @@
             "time": "2015-09-12 10:08:34"
         }
     ],
-    "packages-dev": null,
+    "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": "fabpot/php-cs-fixer",
+            "version": "v1.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
+                "reference": "bd3ec2c2b774e0e127ac2c737ec646d9cf2f9eef"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/bd3ec2c2b774e0e127ac2c737ec646d9cf2f9eef",
+                "reference": "bd3ec2c2b774e0e127ac2c737ec646d9cf2f9eef",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.6",
+                "sebastian/diff": "~1.1",
+                "symfony/console": "~2.3|~3.0",
+                "symfony/event-dispatcher": "~2.1|~3.0",
+                "symfony/filesystem": "~2.1|~3.0",
+                "symfony/finder": "~2.1|~3.0",
+                "symfony/process": "~2.3|~3.0",
+                "symfony/stopwatch": "~2.5|~3.0"
+            },
+            "require-dev": {
+                "satooshi/php-coveralls": "0.7.*@dev"
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\CS\\": "Symfony/CS/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "A tool to automatically fix PHP code style",
+            "time": "2015-12-01 22:34:33"
+        },
+        {
+            "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.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "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-10-06 15:47:00"
+        },
+        {
+            "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.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "ea76b17bced0500a28098626b84eda12dbcf119c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea76b17bced0500a28098626b84eda12dbcf119c",
+                "reference": "ea76b17bced0500a28098626b84eda12dbcf119c",
+                "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-12-12 07:45:58"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "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-10-02 06:51:40"
+        },
+        {
+            "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": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/satooshi/php-coveralls.git",
+                "reference": "3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6",
+                "reference": "3edbdbdb4f4cfab5cb9ce83655ff81432f2221a6",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "guzzle/guzzle": "^2.8|^3.0",
+                "php": ">=5.3.3",
+                "psr/log": "^1.0",
+                "symfony/config": "^2.4|^3.0",
+                "symfony/console": "^2.1|^3.0",
+                "symfony/stopwatch": "^2.2|^3.0",
+                "symfony/yaml": "^2.1|^3.0"
+            },
+            "suggest": {
+                "symfony/http-kernel": "Allows Symfony integration"
+            },
+            "bin": [
+                "bin/coveralls"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Satooshi\\": "src/Satooshi/"
+                }
+            },
+            "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": "2015-12-28 09:07:32"
+        },
+        {
+            "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.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "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": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08 07:14:41"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "6e7133793a8e5a5714a551a8324337374be209df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df",
+                "reference": "6e7133793a8e5a5714a551a8324337374be209df",
+                "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-12-02 08:37:27"
+        },
+        {
+            "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.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "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": "2015-10-12 03:26:01"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+                "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-11-11 19:50:13"
+        },
+        {
+            "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.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "17d4b2e64ce1c6ba7caa040f14469b3c44d7f7d2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/17d4b2e64ce1c6ba7caa040f14469b3c44d7f7d2",
+                "reference": "17d4b2e64ce1c6ba7caa040f14469b3c44d7f7d2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/filesystem": "~2.3|~3.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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-12-26 13:37:56"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "2e06a5ccb19dcf9b89f1c6a677a39a8df773635a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/2e06a5ccb19dcf9b89f1c6a677a39a8df773635a",
+                "reference": "2e06a5ccb19dcf9b89f1c6a677a39a8df773635a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1|~3.0.0",
+                "symfony/process": "~2.1|~3.0.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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-12-22 10:25:57"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc",
+                "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.0,>=2.0.5|~3.0.0",
+                "symfony/dependency-injection": "~2.6|~3.0.0",
+                "symfony/expression-language": "~2.6|~3.0.0",
+                "symfony/stopwatch": "~2.3|~3.0.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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-10-30 20:15:42"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "a7ad724530a764d70c168d321ac226ba3d2f10fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/a7ad724530a764d70c168d321ac226ba3d2f10fc",
+                "reference": "a7ad724530a764d70c168d321ac226ba3d2f10fc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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-12-22 10:25:57"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "dd41ae57f4f737be271d944a0cc5f5f21203a7c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/dd41ae57f4f737be271d944a0cc5f5f21203a7c6",
+                "reference": "dd41ae57f4f737be271d944a0cc5f5f21203a7c6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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 Finder Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-12-05 11:09:21"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "62c254438b5040bc2217156e1570cf2206e8540c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/62c254438b5040bc2217156e1570cf2206e8540c",
+                "reference": "62c254438b5040bc2217156e1570cf2206e8540c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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 Process Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-12-23 11:03:46"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "5f1e2ebd1044da542d2b9510527836e8be92b1cb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5f1e2ebd1044da542d2b9510527836e8be92b1cb",
+                "reference": "5f1e2ebd1044da542d2b9510527836e8be92b1cb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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-10-30 20:15:42"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.8.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
+                "reference": "ac84cbb98b68a6abbc9f5149eb96ccc7b07b8966",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "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-12-26 13:37:56"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {
-        "satooshi/php-coveralls": 20
-    },
+    "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
index 51f7368423..764f9e0623 100644
--- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php
@@ -36,10 +36,10 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnAgeFemale5Years($census, '', '');
 
@@ -51,11 +51,11 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testFemale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
 		$column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -68,11 +68,11 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testUnknownSex() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('U');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
 		$column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -85,11 +85,11 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testLessThanOneYear() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
 
 		$column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -102,11 +102,11 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testLessThanFifteenYears() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1814');
 
 		$column = new CensusColumnAgeFemale5Years($census, '', '');
@@ -119,11 +119,11 @@ class CensusColumnAgeFemale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testRoundedDownToFiveYears() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1844');
 
 		$column = new CensusColumnAgeFemale5Years($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php
index f690866c2c..919a16fe2b 100644
--- a/tests/app/Census/CensusColumnAgeFemaleTest.php
+++ b/tests/app/Census/CensusColumnAgeFemaleTest.php
@@ -36,10 +36,10 @@ class CensusColumnAgeFemaleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnAgeFemale($census, '', '');
 
@@ -51,11 +51,11 @@ class CensusColumnAgeFemaleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testFemale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnAgeFemale($census, '', '');
@@ -68,11 +68,11 @@ class CensusColumnAgeFemaleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testUnknownSex() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('U');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnAgeFemale($census, '', '');
@@ -85,11 +85,11 @@ class CensusColumnAgeFemaleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testLessThanOneYear() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
 
 		$column = new CensusColumnAgeFemale($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
index 148967f835..b4806cc456 100644
--- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php
+++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php
@@ -36,11 +36,11 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
 		$column = new CensusColumnAgeMale5Years($census, '', '');
@@ -53,10 +53,10 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testFemale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnAgeMale5Years($census, '', '');
 
@@ -68,11 +68,11 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testUnknownSex() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('U');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
 
 		$column = new CensusColumnAgeMale5Years($census, '', '');
@@ -85,11 +85,11 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testLessThanOneYear() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
 
 		$column = new CensusColumnAgeMale5Years($census, '', '');
@@ -102,11 +102,11 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testLessThanFifteenYears() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1814');
 
 		$column = new CensusColumnAgeMale5Years($census, '', '');
@@ -119,11 +119,11 @@ class CensusColumnAgeMale5YearsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testRoundedDownToFiveYears() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1844');
 
 		$column = new CensusColumnAgeMale5Years($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php
index 7d47603e5b..1404f97037 100644
--- a/tests/app/Census/CensusColumnAgeMaleTest.php
+++ b/tests/app/Census/CensusColumnAgeMaleTest.php
@@ -36,11 +36,11 @@ class CensusColumnAgeMaleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnAgeMale($census, '', '');
@@ -53,10 +53,10 @@ class CensusColumnAgeMaleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testFemale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnAgeMale($census, '', '');
 
@@ -68,11 +68,11 @@ class CensusColumnAgeMaleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testUnknownSex() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('U');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnAgeMale($census, '', '');
@@ -85,11 +85,11 @@ class CensusColumnAgeMaleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testLessThanOneYear() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1800');
 
 		$column = new CensusColumnAgeMale($census, '', '');
diff --git a/tests/app/Census/CensusColumnAgeTest.php b/tests/app/Census/CensusColumnAgeTest.php
index be516624ec..b9e8630eaf 100644
--- a/tests/app/Census/CensusColumnAgeTest.php
+++ b/tests/app/Census/CensusColumnAgeTest.php
@@ -36,10 +36,10 @@ class CensusColumnAgeTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testGenerateColumn() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn(new Date('01 JAN 1800'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnAge($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDateTest.php b/tests/app/Census/CensusColumnBirthDateTest.php
index fb6a95f59b..bedd8b5f94 100644
--- a/tests/app/Census/CensusColumnBirthDateTest.php
+++ b/tests/app/Census/CensusColumnBirthDateTest.php
@@ -36,16 +36,16 @@ class CensusColumnBirthDateTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testGenerateColumn() {
-		$cal_date = Mockery::mock(Date\CalendarDate::class);
+		$cal_date = Mockery::mock('Fisharebest\Webtrees\Date\CalendarDate');
 		$cal_date->shouldReceive('format')->andReturn('1 1 1800');
 
-		$date = Mockery::mock(Date::class);
+		$date = Mockery::mock('Fisharebest\Webtrees\Date');
 		$date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn($date);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnBirthDate($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
index 3f8dc6f061..b9220deff3 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
@@ -36,18 +36,18 @@ class CensusColumnBirthDaySlashMonthTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testGenerateColumn() {
-		$cal_date = Mockery::mock(Date\CalendarDate::class);
+		$cal_date = Mockery::mock('Fisharebest\Webtrees\Date\CalendarDate');
 		$cal_date->shouldReceive('format')->andReturn('30/6');
 
-		$date = Mockery::mock(Date::class);
+		$date = Mockery::mock('Fisharebest\Webtrees\Date');
 		$date->shouldReceive('minimumJulianDay')->andReturn($cal_date);
 		$date->shouldReceive('maximumJulianDay')->andReturn($cal_date);
 		$date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthDate')->andReturn($date);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnBirthDaySlashMonth($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
index 04492c341e..2323a7b830 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
@@ -36,18 +36,18 @@ class CensusColumnBirthDaySlashMonthYearTest extends \PHPUnit_Framework_TestCase
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testGenerateColumn() {
-		$cal_date = Mockery::mock(Date\CalendarDate::class);
+		$cal_date = Mockery::mock('Fisharebest\Webtrees\Date\CalendarDate');
 		$cal_date->shouldReceive('format')->andReturn('30/6 1832');
 
-		$date = Mockery::mock(Date::class);
+		$date = Mockery::mock('Fisharebest\Webtrees\Date');
 		$date->shouldReceive('minimumJulianDay')->andReturn($cal_date);
 		$date->shouldReceive('maximumJulianDay')->andReturn($cal_date);
 		$date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthDate')->andReturn($date);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnBirthDaySlashMonthYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthMonthTest.php b/tests/app/Census/CensusColumnBirthMonthTest.php
index 75f70499de..337627302f 100644
--- a/tests/app/Census/CensusColumnBirthMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthMonthTest.php
@@ -36,16 +36,16 @@ class CensusColumnBirthMonthTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testGenerateColumn() {
-		$cal_date = Mockery::mock(Date\CalendarDate::class);
+		$cal_date = Mockery::mock('Fisharebest\Webtrees\Date\CalendarDate');
 		$cal_date->shouldReceive('format')->andReturn('Jan');
 
-		$date = Mockery::mock(Date::class);
+		$date = Mockery::mock('Fisharebest\Webtrees\Date');
 		$date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn($date);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnBirthMonth($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
index 83b9fb3364..1ef67b87a4 100644
--- a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php
@@ -35,10 +35,10 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testForeignCountry() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Westminster, London, England');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('United States');
 
 		$column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -51,10 +51,10 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testJustCountry() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('United States');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('United States');
 
 		$column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -67,10 +67,10 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testKnownState() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Maryland, United States');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('United States');
 
 		$column = new CensusColumnBirthPlaceSimple($census, '', '');
@@ -83,10 +83,10 @@ class CensusColumnBirthPlaceSimpleTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testKnownStateAndTown() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Miami, Florida, United States');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('United States');
 
 		$column = new CensusColumnBirthPlaceSimple($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthPlaceTest.php b/tests/app/Census/CensusColumnBirthPlaceTest.php
index 4e4f4ac437..edbca81cee 100644
--- a/tests/app/Census/CensusColumnBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnBirthPlaceTest.php
@@ -35,10 +35,10 @@ class CensusColumnBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceCountry() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Westminster, London, England');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnBirthPlace($census, '', '');
@@ -51,10 +51,10 @@ class CensusColumnBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceAndCountry() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('England');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnBirthPlace($census, '', '');
@@ -67,10 +67,10 @@ class CensusColumnBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testDifferentCountry() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Paris, France');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnBirthPlace($census, '', '');
diff --git a/tests/app/Census/CensusColumnBirthYearTest.php b/tests/app/Census/CensusColumnBirthYearTest.php
index 78378b63a4..db56047033 100644
--- a/tests/app/Census/CensusColumnBirthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthYearTest.php
@@ -36,16 +36,16 @@ class CensusColumnBirthYearTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testGenerateColumn() {
-		$cal_date = Mockery::mock(Date\CalendarDate::class);
+		$cal_date = Mockery::mock('Fisharebest\Webtrees\Date\CalendarDate');
 		$cal_date->shouldReceive('format')->andReturn('1800');
 
-		$date = Mockery::mock(Date::class);
+		$date = Mockery::mock('Fisharebest\Webtrees\Date');
 		$date->shouldReceive('minimumDate')->andReturn($cal_date);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getEstimatedBirthDate')->andReturn($date);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
 
 		$column = new CensusColumnBirthYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php
index 4570f76e97..655f5fe8bf 100644
--- a/tests/app/Census/CensusColumnBornForeignPartsTest.php
+++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php
@@ -35,10 +35,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornEnglandCensusEngland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -51,10 +51,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornWalesCensusEngland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Cardiff, Wales');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -67,10 +67,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornScotlandCensusEngland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Edinburgh, Scotland');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -83,10 +83,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornIrelandCensusEngland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Dublin, Ireland');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -99,10 +99,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornForeignCensusEngland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Elbonia');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -115,10 +115,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornEnglandCensusIreland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Ireland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -131,10 +131,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornWalesCensusIreland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Cardiff, Wales');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Ireland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -147,10 +147,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornScotlandCensusIreland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Edinburgh, Scotland');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Ireland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -163,10 +163,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornIrelandCensusIreland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Dublin, Ireland');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Ireland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -179,10 +179,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornForeignCensusIreland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Elbonia');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Ireland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -195,10 +195,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornEnglandCensusScotland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Scotland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -211,10 +211,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornWalesCensusScotland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Cardiff, Wales');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Scotland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -227,10 +227,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornScotlandCensusScotland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Edinburgh, Scotland');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Scotland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -243,10 +243,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornIrelandCensusScotland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Dublin, Ireland');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Scotland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -259,10 +259,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornForeignCensusScotland() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Elbonia');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Scotland');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -275,10 +275,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornEnglandCensusWales() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Wales');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -291,10 +291,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornWalesCensusWales() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Cardiff, Wales');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Wales');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -307,10 +307,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornScotlandCensusWales() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Edinburgh, Scotland');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Wales');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -323,10 +323,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornIrelandCensusWales() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Dublin, Ireland');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Wales');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
@@ -339,10 +339,10 @@ class CensusColumnBornForeignPartsTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornForeignCensusWales() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Elbonia');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Wales');
 
 		$column = new CensusColumnBornForeignParts($census, '', '');
diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
index fd6e1f22f0..ddc1daa8d0 100644
--- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php
+++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php
@@ -37,10 +37,10 @@ class CensusColumnChildrenBornAliveTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnChildrenBornAlive($census, '', '');
 
@@ -53,33 +53,33 @@ class CensusColumnChildrenBornAliveTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testCountChildren() {
 		// Stillborn
-		$child1 = Mockery::mock(Individual::class);
+		$child1 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child1->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
 		$child1->shouldReceive('getDeathDate')->andReturn(new Date('01 FEB 1904'));
 
 		// Died after census
-		$child2 = Mockery::mock(Individual::class);
+		$child2 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child2->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
 		$child2->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1912'));
 
 		// Died before census
-		$child3 = Mockery::mock(Individual::class);
+		$child3 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child3->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
 		$child3->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1910'));
 
 		// Still living
-		$child4 = Mockery::mock(Individual::class);
+		$child4 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child4->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
 		$child4->shouldReceive('getDeathDate')->andReturn(new Date(''));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getChildren')->andReturn(array($child1, $child2, $child3, $child4));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 MAR 1911');
 
 		$column = new CensusColumnChildrenBornAlive($census, '', '');
diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php
index 47991d6184..96ed5d9526 100644
--- a/tests/app/Census/CensusColumnChildrenDiedTest.php
+++ b/tests/app/Census/CensusColumnChildrenDiedTest.php
@@ -37,10 +37,10 @@ class CensusColumnChildrenDiedTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnChildrenDied($census, '', '');
 
@@ -53,33 +53,33 @@ class CensusColumnChildrenDiedTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testCountChildren() {
 		// Stillborn
-		$child1 = Mockery::mock(Individual::class);
+		$child1 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child1->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
 		$child1->shouldReceive('getDeathDate')->andReturn(new Date('01 FEB 1904'));
 
 		// Died after census
-		$child2 = Mockery::mock(Individual::class);
+		$child2 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child2->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
 		$child2->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1912'));
 
 		// Died before census
-		$child3 = Mockery::mock(Individual::class);
+		$child3 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child3->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
 		$child3->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1910'));
 
 		// Still living
-		$child4 = Mockery::mock(Individual::class);
+		$child4 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child4->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
 		$child4->shouldReceive('getDeathDate')->andReturn(new Date(''));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getChildren')->andReturn(array($child1, $child2, $child3, $child4));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 MAR 1911');
 
 		$column = new CensusColumnChildrenDied($census, '', '');
diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php
index 4c0fda9f28..e934e10e91 100644
--- a/tests/app/Census/CensusColumnChildrenLivingTest.php
+++ b/tests/app/Census/CensusColumnChildrenLivingTest.php
@@ -37,10 +37,10 @@ class CensusColumnChildrenLivingTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnChildrenLiving($census, '', '');
 
@@ -53,33 +53,33 @@ class CensusColumnChildrenLivingTest extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testCountChildren() {
 		// Stillborn
-		$child1 = Mockery::mock(Individual::class);
+		$child1 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child1->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
 		$child1->shouldReceive('getDeathDate')->andReturn(new Date('01 FEB 1904'));
 
 		// Died after census
-		$child2 = Mockery::mock(Individual::class);
+		$child2 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child2->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
 		$child2->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1912'));
 
 		// Died before census
-		$child3 = Mockery::mock(Individual::class);
+		$child3 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child3->shouldReceive('getBirthDate')->andReturn(new Date('02 FEB 1904'));
 		$child3->shouldReceive('getDeathDate')->andReturn(new Date('20 DEC 1910'));
 
 		// Still living
-		$child4 = Mockery::mock(Individual::class);
+		$child4 = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$child4->shouldReceive('getBirthDate')->andReturn(new Date('01 FEB 1904'));
 		$child4->shouldReceive('getDeathDate')->andReturn(new Date(''));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getChildren')->andReturn(array($child1, $child2, $child3, $child4));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('30 MAR 1911');
 
 		$column = new CensusColumnChildrenLiving($census, '', '');
diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php
index 9646a62300..804db7dbee 100644
--- a/tests/app/Census/CensusColumnConditionDanishTest.php
+++ b/tests/app/Census/CensusColumnConditionDanishTest.php
@@ -38,10 +38,10 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoSpouseFamilies() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnConditionDanish($census, '', '');
 
@@ -53,14 +53,14 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoFamilyNoFacts() {
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
 		$family->shouldReceive('getFacts')->andReturn(array());
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnConditionDanish($census, '', '');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -73,16 +73,16 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoFamilyUnmarried() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
 		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnConditionDanish($census, '', '');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -95,17 +95,17 @@ class CensusColumnConditionDanishTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoFamilyDivorced() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
 		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
 		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnConditionDanish($census, '', '');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php
index 76de68c23f..9c10657916 100644
--- a/tests/app/Census/CensusColumnConditionEnglishTest.php
+++ b/tests/app/Census/CensusColumnConditionEnglishTest.php
@@ -38,10 +38,10 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoSpouseFamilies() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnConditionEnglish($census, '', '');
 
@@ -53,14 +53,14 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoFamilyNoFacts() {
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
 		$family->shouldReceive('getFacts')->andReturn(array());
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnConditionEnglish($census, '', '');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -73,16 +73,16 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoFamilyUnmarried() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
 		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnConditionEnglish($census, '', '');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
@@ -95,17 +95,17 @@ class CensusColumnConditionEnglishTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoFamilyDivorced() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getMarriageDate')->andReturn(new Date(''));
 		$family->shouldReceive('getFacts')->with('_NMR')->andReturn(array());
 		$family->shouldReceive('getFacts')->with('DIV')->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnConditionEnglish($census, '', '');
 		$census->shouldReceive('censusDate')->andReturn('30 JUN 1830');
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
index 65548713fd..328a79edf1 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php
@@ -36,16 +36,16 @@ class CensusColumnFatherBirthPlaceSimpleTest extends \PHPUnit_Framework_TestCase
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testKnownStateAndTown() {
-		$father = Mockery::mock(Individual::class);
+		$father = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$father->shouldReceive('getBirthPlace')->andReturn('Miami, Florida, United States');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getHusband')->andReturn($father);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('United States');
 
 		$column = new CensusColumnFatherBirthPlaceSimple($census, '', '');
diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
index 98f34a1cb0..c50a286023 100644
--- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php
@@ -36,16 +36,16 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testSameCountry() {
-		$father = Mockery::mock(Individual::class);
+		$father = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$father->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getHusband')->andReturn($father);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -58,16 +58,16 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testDifferentCountry() {
-		$father = Mockery::mock(Individual::class);
+		$father = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$father->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getHusband')->andReturn($father);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Ireland');
 
 		$column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -80,13 +80,13 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceNoParent() {
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getHusband')->andReturn(null);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnFatherBirthPlace($census, '', '');
@@ -99,10 +99,10 @@ class CensusColumnFatherBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceNoParentFamily() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn(null);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnFatherBirthPlace($census, '', '');
diff --git a/tests/app/Census/CensusColumnFatherForeignTest.php b/tests/app/Census/CensusColumnFatherForeignTest.php
index 80d362c09e..dbdcf11f39 100644
--- a/tests/app/Census/CensusColumnFatherForeignTest.php
+++ b/tests/app/Census/CensusColumnFatherForeignTest.php
@@ -36,16 +36,16 @@ class CensusColumnFatherForeignTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testSameCountry() {
-		$father = Mockery::mock(Individual::class);
+		$father = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$father->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getHusband')->andReturn($father);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnFatherForeign($census, '', '');
@@ -58,16 +58,16 @@ class CensusColumnFatherForeignTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testDifferentCountry() {
-		$father = Mockery::mock(Individual::class);
+		$father = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$father->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getHusband')->andReturn($father);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Ireland');
 
 		$column = new CensusColumnFatherForeign($census, '', '');
@@ -80,13 +80,13 @@ class CensusColumnFatherForeignTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceNoParent() {
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getHusband')->andReturn(null);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnFatherForeign($census, '', '');
@@ -99,10 +99,10 @@ class CensusColumnFatherForeignTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceNoParentFamily() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn(null);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnFatherForeign($census, '', '');
diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php
index 8a36423093..96d11b181a 100644
--- a/tests/app/Census/CensusColumnFullNameTest.php
+++ b/tests/app/Census/CensusColumnFullNameTest.php
@@ -35,10 +35,10 @@ class CensusColumnFullNameTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testFullName() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getFullName')->andReturn('Joe Bloggs');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnFullName($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php
index be4bdea452..e92b9e24ff 100644
--- a/tests/app/Census/CensusColumnGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php
@@ -35,10 +35,10 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testOneGivenName() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe')));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnGivenNameInitial($census, '', '');
 
@@ -50,10 +50,10 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMultipleGivenNames() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe Fred')));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnGivenNameInitial($census, '', '');
 
@@ -65,10 +65,10 @@ class CensusColumnGivenNameInitialTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoName() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnGivenNameInitial($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php
index 23c8c26e7a..f05d741160 100644
--- a/tests/app/Census/CensusColumnGivenNamesTest.php
+++ b/tests/app/Census/CensusColumnGivenNamesTest.php
@@ -35,10 +35,10 @@ class CensusColumnGivenNamesTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testGivenNames() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe')));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnGivenNames($census, '', '');
 
@@ -50,10 +50,10 @@ class CensusColumnGivenNamesTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoName() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnGivenNames($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
index 3a43ee7437..78435e5d4d 100644
--- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php
@@ -38,16 +38,16 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMarriedWithinYear() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact->shouldReceive('getDate')->andReturn(new Date('01 DEC 1859'));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -60,16 +60,16 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNotMarriedWithinYear() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact->shouldReceive('getDate')->andReturn(new Date('01 JAN 1859'));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -82,13 +82,13 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoMarriage() {
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array());
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMarriedWithinYear($census, '', '');
@@ -101,10 +101,10 @@ class CensusColumnMarriedWithinYearTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoSpouseFamily() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMarriedWithinYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
index 2b738d48dd..86cdf95123 100644
--- a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php
@@ -36,10 +36,10 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit_Framework_TestCase
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBornWithinYear() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthDate')->andReturn(new Date('01 JAN 1860'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMonthIfBornWithinYear($census, '', '');
@@ -52,10 +52,10 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit_Framework_TestCase
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNotBornWithinYear() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthDate')->andReturn(new Date('01 JAN 1859'));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMonthIfBornWithinYear($census, '', '');
@@ -68,10 +68,10 @@ class CensusColumnMonthIfBornWithinYearTest extends \PHPUnit_Framework_TestCase
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoBirth() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthDate')->andReturn(new Date(''));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMonthIfBornWithinYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
index fb956b6f3e..b72e817dd8 100644
--- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
+++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php
@@ -38,16 +38,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit_Framework_TestCa
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMarriedWithinYear() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact->shouldReceive('getDate')->andReturn(new Date('01 DEC 1859'));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -60,16 +60,16 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit_Framework_TestCa
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNotMarriedWithinYear() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact->shouldReceive('getDate')->andReturn(new Date('01 JAN 1859'));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -82,13 +82,13 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit_Framework_TestCa
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoMarriage() {
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR')->andReturn(array());
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
@@ -101,10 +101,10 @@ class CensusColumnMonthIfMarriedWithinYearTest extends \PHPUnit_Framework_TestCa
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoSpouseFamily() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnMonthIfMarriedWithinYear($census, '', '');
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
index 8269b84e9c..355a15834a 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php
@@ -36,16 +36,16 @@ class CensusColumnMotherBirthPlaceSimpleTest extends \PHPUnit_Framework_TestCase
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testKnownStateAndTown() {
-		$father = Mockery::mock(Individual::class);
+		$father = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$father->shouldReceive('getBirthPlace')->andReturn('Miami, Florida, United States');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getWife')->andReturn($father);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('United States');
 
 		$column = new CensusColumnMotherBirthPlaceSimple($census, '', '');
diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
index 2be4a5db6f..7a51457efc 100644
--- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
+++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php
@@ -36,16 +36,16 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testSameCountry() {
-		$mother = Mockery::mock(Individual::class);
+		$mother = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$mother->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getWife')->andReturn($mother);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -58,16 +58,16 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testDifferentCountry() {
-		$mother = Mockery::mock(Individual::class);
+		$mother = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$mother->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getWife')->andReturn($mother);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Ireland');
 
 		$column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -80,13 +80,13 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceNoParent() {
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getWife')->andReturn(null);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnMotherBirthPlace($census, '', '');
@@ -99,10 +99,10 @@ class CensusColumnMotherBirthPlaceTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceNoParentFamily() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn(null);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnMotherBirthPlace($census, '', '');
diff --git a/tests/app/Census/CensusColumnMotherForeignTest.php b/tests/app/Census/CensusColumnMotherForeignTest.php
index 242cac2a41..93d1a41960 100644
--- a/tests/app/Census/CensusColumnMotherForeignTest.php
+++ b/tests/app/Census/CensusColumnMotherForeignTest.php
@@ -36,16 +36,16 @@ class CensusColumnMotherForeignTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testSameCountry() {
-		$mother = Mockery::mock(Individual::class);
+		$mother = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$mother->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getWife')->andReturn($mother);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnMotherForeign($census, '', '');
@@ -58,16 +58,16 @@ class CensusColumnMotherForeignTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testDifferentCountry() {
-		$mother = Mockery::mock(Individual::class);
+		$mother = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$mother->shouldReceive('getBirthPlace')->andReturn('London, England');
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getWife')->andReturn($mother);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('Ireland');
 
 		$column = new CensusColumnMotherForeign($census, '', '');
@@ -80,13 +80,13 @@ class CensusColumnMotherForeignTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceNoParent() {
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getWife')->andReturn(null);
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn($family);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnMotherForeign($census, '', '');
@@ -99,10 +99,10 @@ class CensusColumnMotherForeignTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceNoParentFamily() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getPrimaryChildFamily')->andReturn(null);
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnMotherForeign($census, '', '');
diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php
index 8b13eb930c..029d8434c7 100644
--- a/tests/app/Census/CensusColumnNationalityTest.php
+++ b/tests/app/Census/CensusColumnNationalityTest.php
@@ -38,11 +38,11 @@ class CensusColumnNationalityTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testPlaceCountry() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('Australia');
 		$individual->shouldReceive('getFacts')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnNationality($census, '', '');
@@ -55,11 +55,11 @@ class CensusColumnNationalityTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testBritish() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
 		$individual->shouldReceive('getFacts')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 
 		$column = new CensusColumnNationality($census, '', '');
@@ -72,25 +72,25 @@ class CensusColumnNationalityTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testEmigrated() {
-		$place1 = Mockery::mock(Place::class);
+		$place1 = Mockery::mock('Fisharebest\Webtrees\Place');
 		$place1->shouldReceive('getGedcomName')->andReturn('United States');
 
-		$fact1 = Mockery::mock(Fact::class);
+		$fact1 = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact1->shouldReceive('getPlace')->andReturn($place1);
 		$fact1->shouldReceive('getDate')->andReturn(new Date('1855'));
 
-		$place2 = Mockery::mock(Place::class);
+		$place2 = Mockery::mock('Fisharebest\Webtrees\Place');
 		$place2->shouldReceive('getGedcomName')->andReturn('Australia');
 
-		$fact2 = Mockery::mock(Fact::class);
+		$fact2 = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact2->shouldReceive('getPlace')->andReturn($place2);
 		$fact2->shouldReceive('getDate')->andReturn(new Date('1865'));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getBirthPlace')->andReturn('London, England');
 		$individual->shouldReceive('getFacts')->andReturn(array($fact1, $fact2));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusPlace')->andReturn('England');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
diff --git a/tests/app/Census/CensusColumnNullTest.php b/tests/app/Census/CensusColumnNullTest.php
index 04fa6b5b2b..ca93f9ae39 100644
--- a/tests/app/Census/CensusColumnNullTest.php
+++ b/tests/app/Census/CensusColumnNullTest.php
@@ -35,9 +35,9 @@ class CensusColumnNullTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNull() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnNull($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php
index 12c8ac763d..b0afec0dea 100644
--- a/tests/app/Census/CensusColumnOccupationTest.php
+++ b/tests/app/Census/CensusColumnOccupationTest.php
@@ -36,10 +36,10 @@ class CensusColumnOccupationTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoOccupation() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getFacts')->withArgs(array('OCCU'))->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnOccupation($census, '', '');
 
@@ -51,13 +51,13 @@ class CensusColumnOccupationTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testOccupation() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact->shouldReceive('getValue')->andReturn('Farmer');
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getFacts')->withArgs(array('OCCU'))->andReturn(array($fact));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnOccupation($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php
index 81bd713115..9e9fd79118 100644
--- a/tests/app/Census/CensusColumnRelationToHeadTest.php
+++ b/tests/app/Census/CensusColumnRelationToHeadTest.php
@@ -35,9 +35,9 @@ class CensusColumnRelationToHeadTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNull() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnRelationToHead($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php
index 4aa0c222ad..dd5b5e32cc 100644
--- a/tests/app/Census/CensusColumnReligionTest.php
+++ b/tests/app/Census/CensusColumnReligionTest.php
@@ -38,9 +38,9 @@ class CensusColumnReligionTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testReligion() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnReligion($census, '', '');
diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php
index 0d996bb727..f7d8f53344 100644
--- a/tests/app/Census/CensusColumnSexMFTest.php
+++ b/tests/app/Census/CensusColumnSexMFTest.php
@@ -35,10 +35,10 @@ class CensusColumnSexMFTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSexMF($census, '', '');
 
@@ -50,10 +50,10 @@ class CensusColumnSexMFTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testFeale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSexMF($census, '', '');
 
@@ -65,10 +65,10 @@ class CensusColumnSexMFTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testUnknownSex() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('U');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSexMF($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php
index 6832e974ae..1d54c35c14 100644
--- a/tests/app/Census/CensusColumnSexMKTest.php
+++ b/tests/app/Census/CensusColumnSexMKTest.php
@@ -35,10 +35,10 @@ class CensusColumnSexMKTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('M');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSexMK($census, '', '');
 
@@ -50,10 +50,10 @@ class CensusColumnSexMKTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testFeale() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('F');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSexMK($census, '', '');
 
@@ -65,10 +65,10 @@ class CensusColumnSexMKTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testUnknownSex() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSex')->andReturn('U');
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSexMK($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
index 7364643387..547a399cb7 100644
--- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
+++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php
@@ -35,10 +35,10 @@ class CensusColumnSurnameGivenNameInitialTest extends \PHPUnit_Framework_TestCas
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testOneGivenName() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe', 'surn' => 'Sixpack')));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSurnameGivenNameInitial($census, '', '');
 
@@ -50,10 +50,10 @@ class CensusColumnSurnameGivenNameInitialTest extends \PHPUnit_Framework_TestCas
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMultipleGivenNames() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array(array('givn' => 'Joe Fred', 'surn' => 'Sixpack')));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSurnameGivenNameInitial($census, '', '');
 
@@ -65,10 +65,10 @@ class CensusColumnSurnameGivenNameInitialTest extends \PHPUnit_Framework_TestCas
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoName() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSurnameGivenNameInitial($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php
index 1341d48a3e..1174106788 100644
--- a/tests/app/Census/CensusColumnSurnameTest.php
+++ b/tests/app/Census/CensusColumnSurnameTest.php
@@ -35,10 +35,10 @@ class CensusColumnSurnameTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testSurname() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array(array('surname' => 'Bloggs')));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSurname($census, '', '');
 
@@ -50,10 +50,10 @@ class CensusColumnSurnameTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoName() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getAllNames')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 
 		$column = new CensusColumnSurname($census, '', '');
 
diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php
index 4c0d808e38..3f71d38d53 100644
--- a/tests/app/Census/CensusColumnYearsMarriedTest.php
+++ b/tests/app/Census/CensusColumnYearsMarriedTest.php
@@ -38,10 +38,10 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoSpouseFamily() {
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array());
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnYearsMarried($census, '', '');
@@ -54,13 +54,13 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testNoMarriage() {
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn(array());
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnYearsMarried($census, '', '');
@@ -73,16 +73,16 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testUndatedMarriage() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact->shouldReceive('getDate')->andReturn(new Date(''));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnYearsMarried($census, '', '');
@@ -95,16 +95,16 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMarriageAfterCensus() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact->shouldReceive('getDate')->andReturn(new Date('1861'));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnYearsMarried($census, '', '');
@@ -117,16 +117,16 @@ class CensusColumnYearsMarriedTest extends \PHPUnit_Framework_TestCase {
 	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
 	 */
 	public function testMarriageBeforeCensus() {
-		$fact = Mockery::mock(Fact::class);
+		$fact = Mockery::mock('Fisharebest\Webtrees\Fact');
 		$fact->shouldReceive('getDate')->andReturn(new Date('OCT 1851'));
 
-		$family = Mockery::mock(Family::class);
+		$family = Mockery::mock('Fisharebest\Webtrees\Family');
 		$family->shouldReceive('getFacts')->with('MARR', true)->andReturn(array($fact));
 
-		$individual = Mockery::mock(Individual::class);
+		$individual = Mockery::mock('Fisharebest\Webtrees\Individual');
 		$individual->shouldReceive('getSpouseFamilies')->andReturn(array($family));
 
-		$census = Mockery::mock(CensusInterface::class);
+		$census = Mockery::mock('Fisharebest\Webtrees\Census\CensusInterface');
 		$census->shouldReceive('censusDate')->andReturn('01 JUN 1860');
 
 		$column = new CensusColumnYearsMarried($census, '', '');
diff --git a/tests/app/Census/CensusOfDenmark1787Test.php b/tests/app/Census/CensusOfDenmark1787Test.php
index c25ec0de05..1228bcd6d8 100644
--- a/tests/app/Census/CensusOfDenmark1787Test.php
+++ b/tests/app/Census/CensusOfDenmark1787Test.php
@@ -43,11 +43,11 @@ class CensusOfDenmark1787Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[4]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Stilling i familien', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1801Test.php b/tests/app/Census/CensusOfDenmark1801Test.php
index d597e6a5e8..0c1c092b3e 100644
--- a/tests/app/Census/CensusOfDenmark1801Test.php
+++ b/tests/app/Census/CensusOfDenmark1801Test.php
@@ -43,11 +43,11 @@ class CensusOfDenmark1801Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[4]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Stilling i familien', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1803Test.php b/tests/app/Census/CensusOfDenmark1803Test.php
index c3368ab7fa..7771041f11 100644
--- a/tests/app/Census/CensusOfDenmark1803Test.php
+++ b/tests/app/Census/CensusOfDenmark1803Test.php
@@ -43,11 +43,11 @@ class CensusOfDenmark1803Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[4]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Stilling i familien', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1834Test.php b/tests/app/Census/CensusOfDenmark1834Test.php
index 0b3a5da177..a86787877c 100644
--- a/tests/app/Census/CensusOfDenmark1834Test.php
+++ b/tests/app/Census/CensusOfDenmark1834Test.php
@@ -43,10 +43,10 @@ class CensusOfDenmark1834Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(4, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[3]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Alder', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1835Test.php b/tests/app/Census/CensusOfDenmark1835Test.php
index 3c022570f8..962355d3a3 100644
--- a/tests/app/Census/CensusOfDenmark1835Test.php
+++ b/tests/app/Census/CensusOfDenmark1835Test.php
@@ -43,10 +43,10 @@ class CensusOfDenmark1835Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(4, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[3]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Alder', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1840Test.php b/tests/app/Census/CensusOfDenmark1840Test.php
index c29e5e3259..636a17e2ce 100644
--- a/tests/app/Census/CensusOfDenmark1840Test.php
+++ b/tests/app/Census/CensusOfDenmark1840Test.php
@@ -43,10 +43,10 @@ class CensusOfDenmark1840Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(4, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[3]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Alder', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1845Test.php b/tests/app/Census/CensusOfDenmark1845Test.php
index 8394c08909..9c3809e268 100644
--- a/tests/app/Census/CensusOfDenmark1845Test.php
+++ b/tests/app/Census/CensusOfDenmark1845Test.php
@@ -43,13 +43,13 @@ class CensusOfDenmark1845Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(7, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Alder', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1850Test.php b/tests/app/Census/CensusOfDenmark1850Test.php
index 5313ee2363..20a492b1b1 100644
--- a/tests/app/Census/CensusOfDenmark1850Test.php
+++ b/tests/app/Census/CensusOfDenmark1850Test.php
@@ -43,16 +43,16 @@ class CensusOfDenmark1850Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(10, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Alder', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1855Test.php b/tests/app/Census/CensusOfDenmark1855Test.php
index 4ee6e8e670..a0d9724a18 100644
--- a/tests/app/Census/CensusOfDenmark1855Test.php
+++ b/tests/app/Census/CensusOfDenmark1855Test.php
@@ -43,16 +43,16 @@ class CensusOfDenmark1855Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(10, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Alder', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1860Test.php b/tests/app/Census/CensusOfDenmark1860Test.php
index 9a857aef42..351e473c5b 100644
--- a/tests/app/Census/CensusOfDenmark1860Test.php
+++ b/tests/app/Census/CensusOfDenmark1860Test.php
@@ -43,18 +43,18 @@ class CensusOfDenmark1860Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(12, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Alder', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1870Test.php b/tests/app/Census/CensusOfDenmark1870Test.php
index 33015233d3..916b468df7 100644
--- a/tests/app/Census/CensusOfDenmark1870Test.php
+++ b/tests/app/Census/CensusOfDenmark1870Test.php
@@ -43,20 +43,20 @@ class CensusOfDenmark1870Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(14, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMK', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnReligion', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Køn', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1880Test.php b/tests/app/Census/CensusOfDenmark1880Test.php
index bc8e6ca5e8..a8a6b33865 100644
--- a/tests/app/Census/CensusOfDenmark1880Test.php
+++ b/tests/app/Census/CensusOfDenmark1880Test.php
@@ -43,19 +43,19 @@ class CensusOfDenmark1880Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(13, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMK', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnReligion', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Køn', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1885Test.php b/tests/app/Census/CensusOfDenmark1885Test.php
index a6e53561d9..4d67916cfd 100644
--- a/tests/app/Census/CensusOfDenmark1885Test.php
+++ b/tests/app/Census/CensusOfDenmark1885Test.php
@@ -43,19 +43,19 @@ class CensusOfDenmark1885Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(13, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMK', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnReligion', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Køn', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1890Test.php b/tests/app/Census/CensusOfDenmark1890Test.php
index 033d50b3c0..464e99c9f9 100644
--- a/tests/app/Census/CensusOfDenmark1890Test.php
+++ b/tests/app/Census/CensusOfDenmark1890Test.php
@@ -43,21 +43,21 @@ class CensusOfDenmark1890Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(15, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMK', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnReligion', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[14]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Køn', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1895Test.php b/tests/app/Census/CensusOfDenmark1895Test.php
index 6b5a81c551..593b5804b8 100644
--- a/tests/app/Census/CensusOfDenmark1895Test.php
+++ b/tests/app/Census/CensusOfDenmark1895Test.php
@@ -43,21 +43,21 @@ class CensusOfDenmark1895Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(15, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMK', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnReligion', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[14]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Køn', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1901Test.php b/tests/app/Census/CensusOfDenmark1901Test.php
index b96d3eca59..33cb44e6b2 100644
--- a/tests/app/Census/CensusOfDenmark1901Test.php
+++ b/tests/app/Census/CensusOfDenmark1901Test.php
@@ -43,23 +43,23 @@ class CensusOfDenmark1901Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(17, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMK', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnReligion', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[16]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Køn', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1906Test.php b/tests/app/Census/CensusOfDenmark1906Test.php
index 9023f2be56..681503682a 100644
--- a/tests/app/Census/CensusOfDenmark1906Test.php
+++ b/tests/app/Census/CensusOfDenmark1906Test.php
@@ -43,20 +43,20 @@ class CensusOfDenmark1906Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(14, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnReligion::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMK', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionDanish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnReligion', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Køn', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1911Test.php b/tests/app/Census/CensusOfDenmark1911Test.php
index 4ac6b18375..58d417be53 100644
--- a/tests/app/Census/CensusOfDenmark1911Test.php
+++ b/tests/app/Census/CensusOfDenmark1911Test.php
@@ -43,16 +43,16 @@ class CensusOfDenmark1911Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(10, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnBirthDate::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDate', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
 
 		$this->assertSame('', $columns[0]->abbreviation());
 		$this->assertSame('', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1916Test.php b/tests/app/Census/CensusOfDenmark1916Test.php
index 3e7e7e8ddb..c8f198429a 100644
--- a/tests/app/Census/CensusOfDenmark1916Test.php
+++ b/tests/app/Census/CensusOfDenmark1916Test.php
@@ -43,17 +43,17 @@ class CensusOfDenmark1916Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnBirthDate::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDate', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('', $columns[0]->abbreviation());
 		$this->assertSame('', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1921Test.php b/tests/app/Census/CensusOfDenmark1921Test.php
index e0993f5bfb..63f7089da8 100644
--- a/tests/app/Census/CensusOfDenmark1921Test.php
+++ b/tests/app/Census/CensusOfDenmark1921Test.php
@@ -43,17 +43,17 @@ class CensusOfDenmark1921Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnBirthDate::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDate', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('', $columns[0]->abbreviation());
 		$this->assertSame('', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1925Test.php b/tests/app/Census/CensusOfDenmark1925Test.php
index 499a23d653..2f9fab5a56 100644
--- a/tests/app/Census/CensusOfDenmark1925Test.php
+++ b/tests/app/Census/CensusOfDenmark1925Test.php
@@ -43,15 +43,15 @@ class CensusOfDenmark1925Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(9, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnBirthDate::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDate', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
 
 		$this->assertSame('', $columns[0]->abbreviation());
 		$this->assertSame('', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1930Test.php b/tests/app/Census/CensusOfDenmark1930Test.php
index 0c64230f42..4bddcd70c6 100644
--- a/tests/app/Census/CensusOfDenmark1930Test.php
+++ b/tests/app/Census/CensusOfDenmark1930Test.php
@@ -43,17 +43,17 @@ class CensusOfDenmark1930Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnBirthDate::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDate', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('', $columns[0]->abbreviation());
 		$this->assertSame('', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1940Test.php b/tests/app/Census/CensusOfDenmark1940Test.php
index 38e207018c..475ffe1aed 100644
--- a/tests/app/Census/CensusOfDenmark1940Test.php
+++ b/tests/app/Census/CensusOfDenmark1940Test.php
@@ -43,17 +43,17 @@ class CensusOfDenmark1940Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnBirthDate::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDate', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('', $columns[0]->abbreviation());
 		$this->assertSame('', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmark1950Test.php b/tests/app/Census/CensusOfDenmark1950Test.php
index 77067fc49d..521cec15e9 100644
--- a/tests/app/Census/CensusOfDenmark1950Test.php
+++ b/tests/app/Census/CensusOfDenmark1950Test.php
@@ -43,17 +43,17 @@ class CensusOfDenmark1950Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnBirthDate::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthDate', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('', $columns[0]->abbreviation());
 		$this->assertSame('', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfDenmarkTest.php b/tests/app/Census/CensusOfDenmarkTest.php
index 66be0b1114..c70bfe4943 100644
--- a/tests/app/Census/CensusOfDenmarkTest.php
+++ b/tests/app/Census/CensusOfDenmarkTest.php
@@ -42,29 +42,29 @@ class CensusOfDenmarkTest extends \PHPUnit_Framework_TestCase {
 		$census_dates = $census->allCensusDates();
 
 		$this->assertCount(24, $census_dates);
-		$this->assertInstanceOf(CensusOfDenmark1787::class, $census_dates[0]);
-		$this->assertInstanceOf(CensusOfDenmark1801::class, $census_dates[1]);
-		$this->assertInstanceOf(CensusOfDenmark1803::class, $census_dates[2]);
-		$this->assertInstanceOf(CensusOfDenmark1834::class, $census_dates[3]);
-		$this->assertInstanceOf(CensusOfDenmark1835::class, $census_dates[4]);
-		$this->assertInstanceOf(CensusOfDenmark1840::class, $census_dates[5]);
-		$this->assertInstanceOf(CensusOfDenmark1845::class, $census_dates[6]);
-		$this->assertInstanceOf(CensusOfDenmark1850::class, $census_dates[7]);
-		$this->assertInstanceOf(CensusOfDenmark1855::class, $census_dates[8]);
-		$this->assertInstanceOf(CensusOfDenmark1860::class, $census_dates[9]);
-		$this->assertInstanceOf(CensusOfDenmark1870::class, $census_dates[10]);
-		$this->assertInstanceOf(CensusOfDenmark1880::class, $census_dates[11]);
-		$this->assertInstanceOf(CensusOfDenmark1885::class, $census_dates[12]);
-		$this->assertInstanceOf(CensusOfDenmark1890::class, $census_dates[13]);
-		$this->assertInstanceOf(CensusOfDenmark1895::class, $census_dates[14]);
-		$this->assertInstanceOf(CensusOfDenmark1901::class, $census_dates[15]);
-		$this->assertInstanceOf(CensusOfDenmark1906::class, $census_dates[16]);
-		$this->assertInstanceOf(CensusOfDenmark1911::class, $census_dates[17]);
-		$this->assertInstanceOf(CensusOfDenmark1916::class, $census_dates[18]);
-		$this->assertInstanceOf(CensusOfDenmark1921::class, $census_dates[19]);
-		$this->assertInstanceOf(CensusOfDenmark1925::class, $census_dates[20]);
-		$this->assertInstanceOf(CensusOfDenmark1930::class, $census_dates[21]);
-		$this->assertInstanceOf(CensusOfDenmark1940::class, $census_dates[22]);
-		$this->assertInstanceOf(CensusOfDenmark1950::class, $census_dates[23]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1787', $census_dates[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1801', $census_dates[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1803', $census_dates[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1834', $census_dates[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1835', $census_dates[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1840', $census_dates[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1845', $census_dates[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1850', $census_dates[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1855', $census_dates[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1860', $census_dates[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1870', $census_dates[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1880', $census_dates[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1885', $census_dates[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1890', $census_dates[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1895', $census_dates[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1901', $census_dates[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1906', $census_dates[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1911', $census_dates[17]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1916', $census_dates[18]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1921', $census_dates[19]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1925', $census_dates[20]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1930', $census_dates[21]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1940', $census_dates[22]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1950', $census_dates[23]);
 	}
 }
diff --git a/tests/app/Census/CensusOfEngland1841Test.php b/tests/app/Census/CensusOfEngland1841Test.php
index f8536ccfde..31bb27cc8b 100644
--- a/tests/app/Census/CensusOfEngland1841Test.php
+++ b/tests/app/Census/CensusOfEngland1841Test.php
@@ -43,12 +43,12 @@ class CensusOfEngland1841Test extends \PHPUnit_Framework_TestCase {
 		$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(CensusColumnNull::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnBornForeignParts::class, $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBornForeignParts', $columns[5]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('AgeM', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfEngland1851Test.php b/tests/app/Census/CensusOfEngland1851Test.php
index 9ffbb88e56..6d6cd82dad 100644
--- a/tests/app/Census/CensusOfEngland1851Test.php
+++ b/tests/app/Census/CensusOfEngland1851Test.php
@@ -43,14 +43,14 @@ class CensusOfEngland1851Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfEngland1861Test.php b/tests/app/Census/CensusOfEngland1861Test.php
index 847b087594..bedb88b374 100644
--- a/tests/app/Census/CensusOfEngland1861Test.php
+++ b/tests/app/Census/CensusOfEngland1861Test.php
@@ -43,14 +43,14 @@ class CensusOfEngland1861Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfEngland1871Test.php b/tests/app/Census/CensusOfEngland1871Test.php
index caa5b85638..1813e2d6e5 100644
--- a/tests/app/Census/CensusOfEngland1871Test.php
+++ b/tests/app/Census/CensusOfEngland1871Test.php
@@ -43,14 +43,14 @@ class CensusOfEngland1871Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfEngland1881Test.php b/tests/app/Census/CensusOfEngland1881Test.php
index c9b2d6d2f8..511df6a90b 100644
--- a/tests/app/Census/CensusOfEngland1881Test.php
+++ b/tests/app/Census/CensusOfEngland1881Test.php
@@ -43,14 +43,14 @@ class CensusOfEngland1881Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]); // Infirm, etc.
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]); // Infirm, etc.
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfEngland1891Test.php b/tests/app/Census/CensusOfEngland1891Test.php
index 0c618b93ad..fd4c924047 100644
--- a/tests/app/Census/CensusOfEngland1891Test.php
+++ b/tests/app/Census/CensusOfEngland1891Test.php
@@ -43,17 +43,17 @@ class CensusOfEngland1891Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfEngland1901Test.php b/tests/app/Census/CensusOfEngland1901Test.php
index 493b6a35e8..4203d7078c 100644
--- a/tests/app/Census/CensusOfEngland1901Test.php
+++ b/tests/app/Census/CensusOfEngland1901Test.php
@@ -43,16 +43,16 @@ class CensusOfEngland1901Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(10, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfEngland1911Test.php b/tests/app/Census/CensusOfEngland1911Test.php
index 08b94952d9..e39e19dd50 100644
--- a/tests/app/Census/CensusOfEngland1911Test.php
+++ b/tests/app/Census/CensusOfEngland1911Test.php
@@ -43,22 +43,22 @@ class CensusOfEngland1911Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(16, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnChildrenDied::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNationality::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnYearsMarried', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenLiving', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenDied', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNationality', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[15]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfEnglandTest.php b/tests/app/Census/CensusOfEnglandTest.php
index e2800ccaaa..e730739294 100644
--- a/tests/app/Census/CensusOfEnglandTest.php
+++ b/tests/app/Census/CensusOfEnglandTest.php
@@ -42,13 +42,13 @@ class CensusOfEnglandTest extends \PHPUnit_Framework_TestCase {
 		$census_dates = $census->allCensusDates();
 
 		$this->assertCount(8, $census_dates);
-		$this->assertInstanceOf(CensusOfEngland1841::class, $census_dates[0]);
-		$this->assertInstanceOf(CensusOfEngland1851::class, $census_dates[1]);
-		$this->assertInstanceOf(CensusOfEngland1861::class, $census_dates[2]);
-		$this->assertInstanceOf(CensusOfEngland1871::class, $census_dates[3]);
-		$this->assertInstanceOf(CensusOfEngland1881::class, $census_dates[4]);
-		$this->assertInstanceOf(CensusOfEngland1891::class, $census_dates[5]);
-		$this->assertInstanceOf(CensusOfEngland1901::class, $census_dates[6]);
-		$this->assertInstanceOf(CensusOfEngland1911::class, $census_dates[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfEngland1841', $census_dates[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfEngland1851', $census_dates[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfEngland1861', $census_dates[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfEngland1871', $census_dates[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfEngland1881', $census_dates[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfEngland1891', $census_dates[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfEngland1901', $census_dates[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfEngland1911', $census_dates[7]);
 	}
 }
diff --git a/tests/app/Census/CensusOfFrance1836Test.php b/tests/app/Census/CensusOfFrance1836Test.php
index 54e2b49a79..a5453ddd6d 100644
--- a/tests/app/Census/CensusOfFrance1836Test.php
+++ b/tests/app/Census/CensusOfFrance1836Test.php
@@ -43,11 +43,11 @@ class CensusOfFrance1836Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1841Test.php b/tests/app/Census/CensusOfFrance1841Test.php
index e5266a7b9c..9c39162301 100644
--- a/tests/app/Census/CensusOfFrance1841Test.php
+++ b/tests/app/Census/CensusOfFrance1841Test.php
@@ -43,10 +43,10 @@ class CensusOfFrance1841Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(4, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[3]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1846Test.php b/tests/app/Census/CensusOfFrance1846Test.php
index 59080a1ef2..927e60eb96 100644
--- a/tests/app/Census/CensusOfFrance1846Test.php
+++ b/tests/app/Census/CensusOfFrance1846Test.php
@@ -43,11 +43,11 @@ class CensusOfFrance1846Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1851Test.php b/tests/app/Census/CensusOfFrance1851Test.php
index eff2613c0b..f945da6717 100644
--- a/tests/app/Census/CensusOfFrance1851Test.php
+++ b/tests/app/Census/CensusOfFrance1851Test.php
@@ -43,14 +43,14 @@ class CensusOfFrance1851Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNationality::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNationality', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1856Test.php b/tests/app/Census/CensusOfFrance1856Test.php
index fa3313e323..ed7a3659b6 100644
--- a/tests/app/Census/CensusOfFrance1856Test.php
+++ b/tests/app/Census/CensusOfFrance1856Test.php
@@ -43,11 +43,11 @@ class CensusOfFrance1856Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1861Test.php b/tests/app/Census/CensusOfFrance1861Test.php
index 57e990d2df..e6d43804a1 100644
--- a/tests/app/Census/CensusOfFrance1861Test.php
+++ b/tests/app/Census/CensusOfFrance1861Test.php
@@ -43,11 +43,11 @@ class CensusOfFrance1861Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1866Test.php b/tests/app/Census/CensusOfFrance1866Test.php
index c485666915..2b865d1238 100644
--- a/tests/app/Census/CensusOfFrance1866Test.php
+++ b/tests/app/Census/CensusOfFrance1866Test.php
@@ -43,11 +43,11 @@ class CensusOfFrance1866Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1872Test.php b/tests/app/Census/CensusOfFrance1872Test.php
index 85327918ae..3acce13404 100644
--- a/tests/app/Census/CensusOfFrance1872Test.php
+++ b/tests/app/Census/CensusOfFrance1872Test.php
@@ -43,13 +43,13 @@ class CensusOfFrance1872Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(7, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNationality::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNationality', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1876Test.php b/tests/app/Census/CensusOfFrance1876Test.php
index 66680878c1..143d19ce55 100644
--- a/tests/app/Census/CensusOfFrance1876Test.php
+++ b/tests/app/Census/CensusOfFrance1876Test.php
@@ -43,13 +43,13 @@ class CensusOfFrance1876Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(7, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNationality::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNationality', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1881Test.php b/tests/app/Census/CensusOfFrance1881Test.php
index 778343cc9c..bf34655316 100644
--- a/tests/app/Census/CensusOfFrance1881Test.php
+++ b/tests/app/Census/CensusOfFrance1881Test.php
@@ -43,11 +43,11 @@ class CensusOfFrance1881Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1886Test.php b/tests/app/Census/CensusOfFrance1886Test.php
index a9141bfe2f..3532d0b1fd 100644
--- a/tests/app/Census/CensusOfFrance1886Test.php
+++ b/tests/app/Census/CensusOfFrance1886Test.php
@@ -43,12 +43,12 @@ class CensusOfFrance1886Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(6, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNationality::class, $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNationality', $columns[5]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1891Test.php b/tests/app/Census/CensusOfFrance1891Test.php
index 3678bdfb32..4bcff26638 100644
--- a/tests/app/Census/CensusOfFrance1891Test.php
+++ b/tests/app/Census/CensusOfFrance1891Test.php
@@ -43,11 +43,11 @@ class CensusOfFrance1891Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(5, $columns);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnNationality::class, $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNames', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNationality', $columns[4]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 		$this->assertSame('XXXX', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfFrance1896Test.php b/tests/app/Census/CensusOfFrance1896Test.php
index d6f3d2fb0f..33ac151586 100644
--- a/tests/app/Census/CensusOfFrance1896Test.php
+++ b/tests/app/Census/CensusOfFrance1896Test.php
@@ -43,7 +43,7 @@ class CensusOfFrance1896Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(1, $columns);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[0]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 
diff --git a/tests/app/Census/CensusOfFrance1901Test.php b/tests/app/Census/CensusOfFrance1901Test.php
index 7486fdb51c..f84391fce6 100644
--- a/tests/app/Census/CensusOfFrance1901Test.php
+++ b/tests/app/Census/CensusOfFrance1901Test.php
@@ -43,7 +43,7 @@ class CensusOfFrance1901Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(1, $columns);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[0]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 
diff --git a/tests/app/Census/CensusOfFrance1906Test.php b/tests/app/Census/CensusOfFrance1906Test.php
index 0adf627074..00c8ade794 100644
--- a/tests/app/Census/CensusOfFrance1906Test.php
+++ b/tests/app/Census/CensusOfFrance1906Test.php
@@ -43,7 +43,7 @@ class CensusOfFrance1906Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(1, $columns);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[0]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 
diff --git a/tests/app/Census/CensusOfFrance1911Test.php b/tests/app/Census/CensusOfFrance1911Test.php
index 8093d9524e..3ad9d4e47d 100644
--- a/tests/app/Census/CensusOfFrance1911Test.php
+++ b/tests/app/Census/CensusOfFrance1911Test.php
@@ -43,7 +43,7 @@ class CensusOfFrance1911Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(1, $columns);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[0]);
 
 		$this->assertSame('XXXX', $columns[0]->abbreviation());
 
diff --git a/tests/app/Census/CensusOfFranceTest.php b/tests/app/Census/CensusOfFranceTest.php
index 733c1355bc..c1f4c97d50 100644
--- a/tests/app/Census/CensusOfFranceTest.php
+++ b/tests/app/Census/CensusOfFranceTest.php
@@ -42,21 +42,21 @@ class CensusOfFranceTest extends \PHPUnit_Framework_TestCase {
 		$census_dates = $census->allCensusDates();
 
 		$this->assertCount(16, $census_dates);
-		$this->assertInstanceOf(CensusOfFrance1836::class, $census_dates[0]);
-		$this->assertInstanceOf(CensusOfFrance1841::class, $census_dates[1]);
-		$this->assertInstanceOf(CensusOfFrance1846::class, $census_dates[2]);
-		$this->assertInstanceOf(CensusOfFrance1851::class, $census_dates[3]);
-		$this->assertInstanceOf(CensusOfFrance1856::class, $census_dates[4]);
-		$this->assertInstanceOf(CensusOfFrance1861::class, $census_dates[5]);
-		$this->assertInstanceOf(CensusOfFrance1866::class, $census_dates[6]);
-		$this->assertInstanceOf(CensusOfFrance1872::class, $census_dates[7]);
-		$this->assertInstanceOf(CensusOfFrance1876::class, $census_dates[8]);
-		$this->assertInstanceOf(CensusOfFrance1881::class, $census_dates[9]);
-		$this->assertInstanceOf(CensusOfFrance1886::class, $census_dates[10]);
-		$this->assertInstanceOf(CensusOfFrance1891::class, $census_dates[11]);
-		$this->assertInstanceOf(CensusOfFrance1896::class, $census_dates[12]);
-		$this->assertInstanceOf(CensusOfFrance1901::class, $census_dates[13]);
-		$this->assertInstanceOf(CensusOfFrance1906::class, $census_dates[14]);
-		$this->assertInstanceOf(CensusOfFrance1911::class, $census_dates[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1836', $census_dates[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1841', $census_dates[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1846', $census_dates[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1851', $census_dates[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1856', $census_dates[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1861', $census_dates[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1866', $census_dates[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1872', $census_dates[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1876', $census_dates[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1881', $census_dates[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1886', $census_dates[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1891', $census_dates[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1896', $census_dates[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1901', $census_dates[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1906', $census_dates[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance1911', $census_dates[15]);
 	}
 }
diff --git a/tests/app/Census/CensusOfScotland1841Test.php b/tests/app/Census/CensusOfScotland1841Test.php
index d2458e0b06..8df0e30214 100644
--- a/tests/app/Census/CensusOfScotland1841Test.php
+++ b/tests/app/Census/CensusOfScotland1841Test.php
@@ -43,12 +43,12 @@ class CensusOfScotland1841Test extends \PHPUnit_Framework_TestCase {
 		$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(CensusColumnNull::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnBornForeignParts::class, $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBornForeignParts', $columns[5]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('AgeM', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfScotland1851Test.php b/tests/app/Census/CensusOfScotland1851Test.php
index 546e3dc9c8..a6f788650d 100644
--- a/tests/app/Census/CensusOfScotland1851Test.php
+++ b/tests/app/Census/CensusOfScotland1851Test.php
@@ -43,14 +43,14 @@ class CensusOfScotland1851Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfScotland1861Test.php b/tests/app/Census/CensusOfScotland1861Test.php
index 382b206125..4716acce29 100644
--- a/tests/app/Census/CensusOfScotland1861Test.php
+++ b/tests/app/Census/CensusOfScotland1861Test.php
@@ -43,15 +43,15 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(9, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfScotland1871Test.php b/tests/app/Census/CensusOfScotland1871Test.php
index 47b1fd737f..9b2ad279a6 100644
--- a/tests/app/Census/CensusOfScotland1871Test.php
+++ b/tests/app/Census/CensusOfScotland1871Test.php
@@ -43,15 +43,15 @@ class CensusOfScotland1871Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(9, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfScotland1881Test.php b/tests/app/Census/CensusOfScotland1881Test.php
index fa5b576720..cad8bc84f6 100644
--- a/tests/app/Census/CensusOfScotland1881Test.php
+++ b/tests/app/Census/CensusOfScotland1881Test.php
@@ -43,14 +43,14 @@ class CensusOfScotland1881Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfScotland1891Test.php b/tests/app/Census/CensusOfScotland1891Test.php
index 6569a0b2c4..7f24757f27 100644
--- a/tests/app/Census/CensusOfScotland1891Test.php
+++ b/tests/app/Census/CensusOfScotland1891Test.php
@@ -43,18 +43,18 @@ class CensusOfScotland1891Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(12, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfScotland1901Test.php b/tests/app/Census/CensusOfScotland1901Test.php
index 8086145a9f..916296469b 100644
--- a/tests/app/Census/CensusOfScotland1901Test.php
+++ b/tests/app/Census/CensusOfScotland1901Test.php
@@ -43,17 +43,17 @@ class CensusOfScotland1901Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfScotland1911Test.php b/tests/app/Census/CensusOfScotland1911Test.php
index ffc8fcf1ed..cd010f44bf 100644
--- a/tests/app/Census/CensusOfScotland1911Test.php
+++ b/tests/app/Census/CensusOfScotland1911Test.php
@@ -43,23 +43,23 @@ class CensusOfScotland1911Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(17, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnChildrenDied::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNationality::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnYearsMarried', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenLiving', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenDied', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNationality', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[16]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfScotlandTest.php b/tests/app/Census/CensusOfScotlandTest.php
index 88de6c17f0..9033e616d9 100644
--- a/tests/app/Census/CensusOfScotlandTest.php
+++ b/tests/app/Census/CensusOfScotlandTest.php
@@ -42,13 +42,13 @@ class CensusOfScotlandTest extends \PHPUnit_Framework_TestCase {
 		$census_dates = $census->allCensusDates();
 
 		$this->assertCount(8, $census_dates);
-		$this->assertInstanceOf(CensusOfScotland1841::class, $census_dates[0]);
-		$this->assertInstanceOf(CensusOfScotland1851::class, $census_dates[1]);
-		$this->assertInstanceOf(CensusOfScotland1861::class, $census_dates[2]);
-		$this->assertInstanceOf(CensusOfScotland1871::class, $census_dates[3]);
-		$this->assertInstanceOf(CensusOfScotland1881::class, $census_dates[4]);
-		$this->assertInstanceOf(CensusOfScotland1891::class, $census_dates[5]);
-		$this->assertInstanceOf(CensusOfScotland1901::class, $census_dates[6]);
-		$this->assertInstanceOf(CensusOfScotland1911::class, $census_dates[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfScotland1841', $census_dates[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfScotland1851', $census_dates[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfScotland1861', $census_dates[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfScotland1871', $census_dates[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfScotland1881', $census_dates[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfScotland1891', $census_dates[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfScotland1901', $census_dates[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfScotland1911', $census_dates[7]);
 	}
 }
diff --git a/tests/app/Census/CensusOfUnitedStates1850Test.php b/tests/app/Census/CensusOfUnitedStates1850Test.php
index 6faee2ef41..5a709833a6 100644
--- a/tests/app/Census/CensusOfUnitedStates1850Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1850Test.php
@@ -43,17 +43,17 @@ class CensusOfUnitedStates1850Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnMarriedWithinYear::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Age', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfUnitedStates1860Test.php b/tests/app/Census/CensusOfUnitedStates1860Test.php
index 621a837877..9bf62dd575 100644
--- a/tests/app/Census/CensusOfUnitedStates1860Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1860Test.php
@@ -43,18 +43,18 @@ class CensusOfUnitedStates1860Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(12, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnMarriedWithinYear::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Age', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfUnitedStates1870Test.php b/tests/app/Census/CensusOfUnitedStates1870Test.php
index cdb5eef1ca..8036687a75 100644
--- a/tests/app/Census/CensusOfUnitedStates1870Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1870Test.php
@@ -43,24 +43,24 @@ class CensusOfUnitedStates1870Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(18, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnFatherForeign::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnMotherForeign::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnMonthIfBornWithinYear::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnMonthIfMarriedWithinYear::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[17]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherForeign', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMotherForeign', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMonthIfBornWithinYear', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[17]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Age', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfUnitedStates1880Test.php b/tests/app/Census/CensusOfUnitedStates1880Test.php
index fe7bfc15a0..55fa7912f4 100644
--- a/tests/app/Census/CensusOfUnitedStates1880Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1880Test.php
@@ -43,29 +43,29 @@ class CensusOfUnitedStates1880Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(23, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnMonthIfBornWithinYear::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[17]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[18]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[19]);
-		$this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[20]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[21]);
-		$this->assertInstanceOf(CensusColumnMotherBirthPlaceSimple::class, $columns[22]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMonthIfBornWithinYear', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[17]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[18]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[19]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple', $columns[20]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[21]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlaceSimple', $columns[22]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Age', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfUnitedStates1890Test.php b/tests/app/Census/CensusOfUnitedStates1890Test.php
index ce4670ff56..a0d93d6ed1 100644
--- a/tests/app/Census/CensusOfUnitedStates1890Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1890Test.php
@@ -43,30 +43,30 @@ class CensusOfUnitedStates1890Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(24, $columns);
-		$this->assertInstanceOf(CensusColumnGivenNameInitial::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnSurname::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnMonthIfMarriedWithinYear::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[16]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[17]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[18]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[19]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[20]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[21]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[22]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[23]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnGivenNameInitial', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurname', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[17]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[18]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[19]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[20]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[21]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[22]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[23]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Surname', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfUnitedStates1900Test.php b/tests/app/Census/CensusOfUnitedStates1900Test.php
index e8807f910f..df94c98d62 100644
--- a/tests/app/Census/CensusOfUnitedStates1900Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1900Test.php
@@ -43,32 +43,32 @@ class CensusOfUnitedStates1900Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(26, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnBirthMonth::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnBirthYear::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[17]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[18]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[19]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[20]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[21]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[22]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[23]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[24]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[25]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthMonth', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthYear', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnYearsMarried', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenLiving', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[17]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[18]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[19]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[20]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[21]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[22]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[23]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[24]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[25]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfUnitedStates1910Test.php b/tests/app/Census/CensusOfUnitedStates1910Test.php
index d664ee4edc..434733633d 100644
--- a/tests/app/Census/CensusOfUnitedStates1910Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1910Test.php
@@ -43,35 +43,35 @@ class CensusOfUnitedStates1910Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(29, $columns);
-		$this->assertInstanceOf(CensusColumnSurnameGivenNameInitial::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[17]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[18]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[19]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[20]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[21]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[22]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[23]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[24]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[25]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[26]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[27]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[28]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNameInitial', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnYearsMarried', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenLiving', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[17]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[18]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[19]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[20]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[21]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[22]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[23]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[24]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[25]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[26]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[27]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[28]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfUnitedStates1920Test.php b/tests/app/Census/CensusOfUnitedStates1920Test.php
index 4c23f208dc..4072c26d7a 100644
--- a/tests/app/Census/CensusOfUnitedStates1920Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1920Test.php
@@ -43,30 +43,30 @@ class CensusOfUnitedStates1920Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(24, $columns);
-		$this->assertInstanceOf(CensusColumnSurnameGivenNameInitial::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[16]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[17]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[18]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[19]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[20]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[21]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[22]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[23]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNameInitial', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[17]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[18]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[19]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[20]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[21]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[22]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[23]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfUnitedStates1930Test.php b/tests/app/Census/CensusOfUnitedStates1930Test.php
index 2cff8cd2fe..a3c679d475 100644
--- a/tests/app/Census/CensusOfUnitedStates1930Test.php
+++ b/tests/app/Census/CensusOfUnitedStates1930Test.php
@@ -43,38 +43,38 @@ class CensusOfUnitedStates1930Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(32, $columns);
-		$this->assertInstanceOf(CensusColumnSurnameGivenNameInitial::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnSexMF::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnAge::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnMotherBirthPlaceSimple::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[17]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[18]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[19]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[20]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[21]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[22]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[23]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[24]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[25]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[26]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[27]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[28]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[29]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[30]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[31]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNameInitial', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnSexMF', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAge', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlaceSimple', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[17]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[18]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[19]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[20]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[21]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[22]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[23]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[24]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[25]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[26]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[27]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[28]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[29]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[30]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[31]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfUnitedStatesTest.php b/tests/app/Census/CensusOfUnitedStatesTest.php
index 4f1df850cd..12b9182eed 100644
--- a/tests/app/Census/CensusOfUnitedStatesTest.php
+++ b/tests/app/Census/CensusOfUnitedStatesTest.php
@@ -42,14 +42,14 @@ class CensusOfUnitedStatesTest extends \PHPUnit_Framework_TestCase {
 		$census_dates = $census->allCensusDates();
 
 		$this->assertCount(9, $census_dates);
-		$this->assertInstanceOf(CensusOfUnitedStates1850::class, $census_dates[0]);
-		$this->assertInstanceOf(CensusOfUnitedStates1860::class, $census_dates[1]);
-		$this->assertInstanceOf(CensusOfUnitedStates1870::class, $census_dates[2]);
-		$this->assertInstanceOf(CensusOfUnitedStates1880::class, $census_dates[3]);
-		$this->assertInstanceOf(CensusOfUnitedStates1890::class, $census_dates[4]);
-		$this->assertInstanceOf(CensusOfUnitedStates1900::class, $census_dates[5]);
-		$this->assertInstanceOf(CensusOfUnitedStates1910::class, $census_dates[6]);
-		$this->assertInstanceOf(CensusOfUnitedStates1920::class, $census_dates[7]);
-		$this->assertInstanceOf(CensusOfUnitedStates1930::class, $census_dates[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates1850', $census_dates[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates1860', $census_dates[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates1870', $census_dates[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates1880', $census_dates[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates1890', $census_dates[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates1900', $census_dates[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates1910', $census_dates[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates1920', $census_dates[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates1930', $census_dates[8]);
 	}
 }
diff --git a/tests/app/Census/CensusOfWales1841Test.php b/tests/app/Census/CensusOfWales1841Test.php
index c76e0cc46c..09280e19c9 100644
--- a/tests/app/Census/CensusOfWales1841Test.php
+++ b/tests/app/Census/CensusOfWales1841Test.php
@@ -43,12 +43,12 @@ class CensusOfWales1841Test extends \PHPUnit_Framework_TestCase {
 		$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(CensusColumnNull::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnBornForeignParts::class, $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBornForeignParts', $columns[5]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('AgeM', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfWales1851Test.php b/tests/app/Census/CensusOfWales1851Test.php
index b7a7d6ddaf..b6a6ecefeb 100644
--- a/tests/app/Census/CensusOfWales1851Test.php
+++ b/tests/app/Census/CensusOfWales1851Test.php
@@ -43,14 +43,14 @@ class CensusOfWales1851Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfWales1861Test.php b/tests/app/Census/CensusOfWales1861Test.php
index af12645009..8c041002b4 100644
--- a/tests/app/Census/CensusOfWales1861Test.php
+++ b/tests/app/Census/CensusOfWales1861Test.php
@@ -43,14 +43,14 @@ class CensusOfWales1861Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfWales1871Test.php b/tests/app/Census/CensusOfWales1871Test.php
index 6f805b042d..e0ded80999 100644
--- a/tests/app/Census/CensusOfWales1871Test.php
+++ b/tests/app/Census/CensusOfWales1871Test.php
@@ -43,14 +43,14 @@ class CensusOfWales1871Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfWales1881Test.php b/tests/app/Census/CensusOfWales1881Test.php
index 3c98fc814c..d7646c651b 100644
--- a/tests/app/Census/CensusOfWales1881Test.php
+++ b/tests/app/Census/CensusOfWales1881Test.php
@@ -43,14 +43,14 @@ class CensusOfWales1881Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(8, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfWales1891Test.php b/tests/app/Census/CensusOfWales1891Test.php
index 314180341d..8436250c70 100644
--- a/tests/app/Census/CensusOfWales1891Test.php
+++ b/tests/app/Census/CensusOfWales1891Test.php
@@ -43,17 +43,17 @@ class CensusOfWales1891Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfWales1901Test.php b/tests/app/Census/CensusOfWales1901Test.php
index d652545d98..29c2a606f8 100644
--- a/tests/app/Census/CensusOfWales1901Test.php
+++ b/tests/app/Census/CensusOfWales1901Test.php
@@ -43,17 +43,17 @@ class CensusOfWales1901Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(11, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfWales1911Test.php b/tests/app/Census/CensusOfWales1911Test.php
index 4995720f6a..6b2ec00acc 100644
--- a/tests/app/Census/CensusOfWales1911Test.php
+++ b/tests/app/Census/CensusOfWales1911Test.php
@@ -43,23 +43,23 @@ class CensusOfWales1911Test extends \PHPUnit_Framework_TestCase {
 		$columns = $census->columns();
 
 		$this->assertCount(17, $columns);
-		$this->assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-		$this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]);
-		$this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]);
-		$this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]);
-		$this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]);
-		$this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[5]);
-		$this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[6]);
-		$this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[7]);
-		$this->assertInstanceOf(CensusColumnChildrenDied::class, $columns[8]);
-		$this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[10]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[11]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[12]);
-		$this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[13]);
-		$this->assertInstanceOf(CensusColumnNationality::class, $columns[14]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[15]);
-		$this->assertInstanceOf(CensusColumnNull::class, $columns[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnFullName', $columns[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnRelationToHead', $columns[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeMale', $columns[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnAgeFemale', $columns[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnConditionEnglish', $columns[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnYearsMarried', $columns[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive', $columns[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenLiving', $columns[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnChildrenDied', $columns[8]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnOccupation', $columns[9]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[10]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[11]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[12]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnBirthPlace', $columns[13]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNationality', $columns[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[16]);
 
 		$this->assertSame('Name', $columns[0]->abbreviation());
 		$this->assertSame('Relation', $columns[1]->abbreviation());
diff --git a/tests/app/Census/CensusOfWalesTest.php b/tests/app/Census/CensusOfWalesTest.php
index 7312704cb9..4a82862b48 100644
--- a/tests/app/Census/CensusOfWalesTest.php
+++ b/tests/app/Census/CensusOfWalesTest.php
@@ -42,13 +42,13 @@ class CensusOfWalesTest extends \PHPUnit_Framework_TestCase {
 		$census_dates = $census->allCensusDates();
 
 		$this->assertCount(8, $census_dates);
-		$this->assertInstanceOf(CensusOfWales1841::class, $census_dates[0]);
-		$this->assertInstanceOf(CensusOfWales1851::class, $census_dates[1]);
-		$this->assertInstanceOf(CensusOfWales1861::class, $census_dates[2]);
-		$this->assertInstanceOf(CensusOfWales1871::class, $census_dates[3]);
-		$this->assertInstanceOf(CensusOfWales1881::class, $census_dates[4]);
-		$this->assertInstanceOf(CensusOfWales1891::class, $census_dates[5]);
-		$this->assertInstanceOf(CensusOfWales1901::class, $census_dates[6]);
-		$this->assertInstanceOf(CensusOfWales1911::class, $census_dates[7]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfWales1841', $census_dates[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfWales1851', $census_dates[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfWales1861', $census_dates[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfWales1871', $census_dates[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfWales1881', $census_dates[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfWales1891', $census_dates[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfWales1901', $census_dates[6]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfWales1911', $census_dates[7]);
 	}
 }
diff --git a/tests/app/Census/CensusTest.php b/tests/app/Census/CensusTest.php
index e823e864e4..92a2bf1f04 100644
--- a/tests/app/Census/CensusTest.php
+++ b/tests/app/Census/CensusTest.php
@@ -27,11 +27,11 @@ class CensusTest extends \PHPUnit_Framework_TestCase {
 		$censuses = Census::allCensusPlaces();
 
 		$this->assertCount(6, $censuses);
-		$this->assertInstanceOf(CensusOfDenmark::class, $censuses[0]);
-		$this->assertInstanceOf(CensusOfEngland::class, $censuses[1]);
-		$this->assertInstanceOf(CensusOfFrance::class, $censuses[2]);
-		$this->assertInstanceOf(CensusOfScotland::class, $censuses[3]);
-		$this->assertInstanceOf(CensusOfUnitedStates::class, $censuses[4]);
-		$this->assertInstanceOf(CensusOfWales::class, $censuses[5]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark', $censuses[0]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfEngland', $censuses[1]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfFrance', $censuses[2]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfScotland', $censuses[3]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfUnitedStates', $censuses[4]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfWales', $censuses[5]);
 	}
 }