Update Danish census

8 files changed, 39 insertions, 199 deletions

diff --git a/app/Census/CensusOfDenmark.php b/app/Census/CensusOfDenmark.php
index 2dec4dae6f..f4a99fb14c 100644
--- a/app/Census/CensusOfDenmark.php
+++ b/app/Census/CensusOfDenmark.php
@@ -40,7 +40,6 @@ class CensusOfDenmark extends Census implements CensusPlaceInterface {
 			new CensusOfDenmark1880(),
 			new CensusOfDenmark1885(),
 			new CensusOfDenmark1890(),
-			new CensusOfDenmark1895(),
 			new CensusOfDenmark1901(),
 			new CensusOfDenmark1906(),
 			new CensusOfDenmark1911(),
diff --git a/app/Census/CensusOfDenmark1895.php b/app/Census/CensusOfDenmark1895.php
deleted file mode 100644
index 899226dd41..0000000000
--- a/app/Census/CensusOfDenmark1895.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * webtrees: online genealogy
- * Copyright (C) 2015 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-namespace Fisharebest\Webtrees\Census;
-
-/**
- * Definitions for a census
- */
-class CensusOfDenmark1895 extends CensusOfDenmark implements CensusInterface {
-	/**
-	 * When did this census occur.
-	 *
-	 * @return string
-	 */
-	public function censusDate() {
-		return '01 FEB 1895';
-	}
-
-	/**
-	 * Where did this census occur, in GEDCOM format.
-	 *
-	 * @return string
-	 */
-	public function censusPlace() {
-		return 'København, Danmark';
-	}
-
-	/**
-	 * The columns of the census.
-	 *
-	 * @return CensusColumnInterface[]
-	 */
-	public function columns() {
-		return array(
-			new CensusColumnFullName($this, 'Navn', 'Samtlige Personers fulde Navn.'),
-			new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).'),
-			new CensusColumnAge($this, 'Alder', 'Alder.  Alderen anføres med det fyldte Aar, men for Børn, der ikke have fyldt 1 Aar, anføres „Under 1 Aar“ of Fødselsdagen.'),
-			new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).'),
-			new CensusColumnReligion($this, 'Trossamfund', 'Trossamfund („Folkekirken“ eller andetSamfund, saasom „det frilutheranske“, „det romersk katholske“, det „mosaiske“ o.s.v.).'),
-			new CensusColumnBirthPlace($this, 'Fødested', 'Fødested, nemlig Sognets og Amtets eller Kjøbstadens (eller Handelpladsens) Navn, og for de i Bilandene Fødte samt for Udlændinge Landet, hvori de ere fødte.'),
-			new CensusColumnRelationToHead($this, 'Stilling i familien', 'Stilling i Familien (Husfader, Husmoder, Barn, Tjenestetyende, Logerende o.s.v.).'),
-			new CensusColumnOccupation($this, 'Erhverv', 'Erhverv (Embede, Forretning, Næringsvej og Titel, samt Vedkommendes Stilling som Hovedperson eller Medhjælper, Forvalter, Svend eller Dreng o.s.v.). - Arten af Erhvervet (Gaardejer, Husmand, Grovsmed, Vognfabrikant, Høker o.s.v.). - Under Fattigforsørgelse.'),
-			new CensusColumnNull($this, 'Erhvervsstedet', 'Erhvervsstedet (Beboelseskommunen eller hvilken anden Kommune).'),
-			new CensusColumnNull($this, 'Døvstumme', 'Døvstumme.'),
-			new CensusColumnNull($this, 'Døve', 'Døve (Hørelson aldeles berøvet).'),
-			new CensusColumnNull($this, 'Blinde', 'Blinde (Synet aldeles borsvet).'),
-			new CensusColumnNull($this, 'Idioter', 'Uden Forstandsovner (Idioter).'),
-			new CensusColumnNull($this, 'Sindssyge', 'Sindssyge.'),
-			new CensusColumnNull($this, 'Anmærkninger', 'Anmærkninger.'),
-		);
-	}
-}
diff --git a/app/Census/CensusOfDenmark1930.php b/app/Census/CensusOfDenmark1930.php
index e0c895c843..c22a96ba18 100644
--- a/app/Census/CensusOfDenmark1930.php
+++ b/app/Census/CensusOfDenmark1930.php
@@ -25,7 +25,7 @@ class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface {
 	 * @return string
 	 */
 	public function censusDate() {
-		return '01 NOV 1930';
+		return '05 NOV 1930';
 	}
 
 	/**
@@ -37,8 +37,8 @@ class CensusOfDenmark1930 extends CensusOfDenmark implements CensusInterface {
 		return array(
 			new CensusColumnSurnameGivenNames($this, 'Navn', ''),
 			new CensusColumnNull($this, 'Bopæl', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
+			new CensusColumnNull($this, 'Andetsteds', 'Hvis den i Rubrik 3 opførte Person har fast Bopæl andetsteds, anføres her den faste Bopæl'),
+			new CensusColumnNull($this, 'Stede', 'Hvis den i Rubrik 3 opførte Person paa Tællingsdagen til Stede paa Tællingsstedet? Ja eller Nej.'),
 			new CensusColumnNull($this, 'Bopæl', 'Bopæl den 5. Novbr. 1929'),
 			new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'),
 			new CensusColumnBirthDaySlashMonth($this, 'Fødselsdag', ''),
diff --git a/app/Census/CensusOfDenmark1940.php b/app/Census/CensusOfDenmark1940.php
index e8b711d932..1b50304f1d 100644
--- a/app/Census/CensusOfDenmark1940.php
+++ b/app/Census/CensusOfDenmark1940.php
@@ -25,7 +25,7 @@ class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface {
 	 * @return string
 	 */
 	public function censusDate() {
-		return '01 NOV 1940';
+		return '05 NOV 1940';
 	}
 
 	/**
@@ -36,20 +36,20 @@ class CensusOfDenmark1940 extends CensusOfDenmark implements CensusInterface {
 	public function columns() {
 		return array(
 			new CensusColumnSurnameGivenNames($this, 'Navn', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnSexMK($this, 'Køn', 'Kjønnet. Mandkøn (M) eller Kvindekøn (K).'),
+			new CensusColumnNull($this, 'Nærværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg nærværende d.v.s. har fast Bopæl ????? (er optaget under en anden Address i Folkeregistret), anføres her den faste Bopæls Adresse (Kommunens Navn og den fuldstændige Adresse i denne; for Udlændinge dog kun Landets Navn).'),
+			new CensusColumnNull($this, 'Fraværende', 'Hvis den i Rubrik 1 opførte Person er midleritidg fraværende d.v.s. har fast Bopæl paa Tællingsstedet (er optaget underdenne Address i Folkeregistret), men den 5. Novemer ikke er til Stede paa Tællingsstedet, anføres her  „fraværende“ og Adressen paa det midlertidige Opholdssted (ved Ophold i Udlandet anføres jun Landets Navn).'),
+			new CensusColumnSexMK($this, 'Køn', 'Køn Mand (M) Kvinde (K)'),
 			new CensusColumnBirthDaySlashMonth($this, 'Fødselsdag', ''),
 			new CensusColumnBirthYear($this, 'Fødselsaar', ''),
 			new CensusColumnBirthPlace($this, 'Fødested', ''),
 			new CensusColumnNull($this, 'Statsbergerferhold', ''),
 			new CensusColumnConditionDanish($this, 'Civilstand', 'Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).'),
-			new CensusColumnNull($this, '', ''),
+			new CensusColumnNull($this, 'Indgaaelse', 'Date for det nuværende Ægteskabs Indgaaelse.  NB." RUbrikken udfyldes ikke al Enkemaend, Enker, Separerede eller Fraskilte.'),
 			new CensusColumnRelationToHead($this, 'Stilling i familien', ''),
 			new CensusColumnOccupation($this, 'Erhverv', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
-			new CensusColumnNull($this, '', ''),
+			new CensusColumnNull($this, 'Virksomhedens', 'Virksomhedens (Branchens) Art'),
+			new CensusColumnNull($this, 'Hustruen', 'Besvares kun af Hustruen og hjemmeboende Børn over 14 Aar'),
+			new CensusColumnNull($this, 'Døtre', 'Besvares kun af hjemmeboende Døtre over 14 Aar'),
 		);
 	}
 }
diff --git a/tests/app/Census/CensusOfDenmark1895Test.php b/tests/app/Census/CensusOfDenmark1895Test.php
deleted file mode 100644
index 593b5804b8..0000000000
--- a/tests/app/Census/CensusOfDenmark1895Test.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/**
- * webtrees: online genealogy
- * Copyright (C) 2015 webtrees development team
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-namespace Fisharebest\Webtrees\Census;
-
-/**
- * Test harness for the class CensusOfDenmark1895
- */
-class CensusOfDenmark1895Test extends \PHPUnit_Framework_TestCase {
-	/**
-	 * Test the census place and date
-	 *
-	 * @covers Fisharebest\Webtrees\Census\CensusOfDenmark1895
-	 */
-	public function testPlaceAndDate() {
-		$census = new CensusOfDenmark1895;
-
-		$this->assertSame('København, Danmark', $census->censusPlace());
-		$this->assertSame('01 FEB 1895', $census->censusDate());
-	}
-
-	/**
-	 * Test the census columns
-	 *
-	 * @covers Fisharebest\Webtrees\Census\CensusOfDenmark1895
-	 * @covers Fisharebest\Webtrees\Census\AbstractCensusColumn
-	 */
-	public function testColumns() {
-		$census  = new CensusOfDenmark1895;
-		$columns = $census->columns();
-
-		$this->assertCount(15, $columns);
-		$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());
-		$this->assertSame('Alder', $columns[2]->abbreviation());
-		$this->assertSame('Civilstand', $columns[3]->abbreviation());
-		$this->assertSame('Trossamfund', $columns[4]->abbreviation());
-		$this->assertSame('Fødested', $columns[5]->abbreviation());
-		$this->assertSame('Stilling i familien', $columns[6]->abbreviation());
-		$this->assertSame('Erhverv', $columns[7]->abbreviation());
-		$this->assertSame('Erhvervsstedet', $columns[8]->abbreviation());
-		$this->assertSame('Døvstumme', $columns[9]->abbreviation());
-		$this->assertSame('Døve', $columns[10]->abbreviation());
-		$this->assertSame('Blinde', $columns[11]->abbreviation());
-		$this->assertSame('Idioter', $columns[12]->abbreviation());
-		$this->assertSame('Sindssyge', $columns[13]->abbreviation());
-		$this->assertSame('Anmærkninger', $columns[14]->abbreviation());
-
-		$this->assertSame('Samtlige Personers fulde Navn.', $columns[0]->title());
-		$this->assertSame('Kjønnet. Mandkøn (M.) eller Kvindekøn (Kv.).', $columns[1]->title());
-		$this->assertSame('Alder.  Alderen anføres med det fyldte Aar, men for Børn, der ikke have fyldt 1 Aar, anføres „Under 1 Aar“ of Fødselsdagen.', $columns[2]->title());
-		$this->assertSame('Ægteskabelig Stillinge. Ugift (U.), Gift (G.), Enkemand eller Enke (E.), Separeret (S.), Fraskilt (F.).', $columns[3]->title());
-		$this->assertSame('Trossamfund („Folkekirken“ eller andetSamfund, saasom „det frilutheranske“, „det romersk katholske“, det „mosaiske“ o.s.v.).', $columns[4]->title());
-		$this->assertSame('Fødested, nemlig Sognets og Amtets eller Kjøbstadens (eller Handelpladsens) Navn, og for de i Bilandene Fødte samt for Udlændinge Landet, hvori de ere fødte.', $columns[5]->title());
-		$this->assertSame('Stilling i Familien (Husfader, Husmoder, Barn, Tjenestetyende, Logerende o.s.v.).', $columns[6]->title());
-		$this->assertSame('Erhverv (Embede, Forretning, Næringsvej og Titel, samt Vedkommendes Stilling som Hovedperson eller Medhjælper, Forvalter, Svend eller Dreng o.s.v.). - Arten af Erhvervet (Gaardejer, Husmand, Grovsmed, Vognfabrikant, Høker o.s.v.). - Under Fattigforsørgelse.', $columns[7]->title());
-		$this->assertSame('Erhvervsstedet (Beboelseskommunen eller hvilken anden Kommune).', $columns[8]->title());
-		$this->assertSame('Døvstumme.', $columns[9]->title());
-		$this->assertSame('Døve (Hørelson aldeles berøvet).', $columns[10]->title());
-		$this->assertSame('Blinde (Synet aldeles borsvet).', $columns[11]->title());
-		$this->assertSame('Uden Forstandsovner (Idioter).', $columns[12]->title());
-		$this->assertSame('Sindssyge.', $columns[13]->title());
-		$this->assertSame('Anmærkninger.', $columns[14]->title());
-	}
-}
diff --git a/tests/app/Census/CensusOfDenmark1930Test.php b/tests/app/Census/CensusOfDenmark1930Test.php
index cae5ae7b25..0ba8286472 100644
--- a/tests/app/Census/CensusOfDenmark1930Test.php
+++ b/tests/app/Census/CensusOfDenmark1930Test.php
@@ -29,7 +29,7 @@ class CensusOfDenmark1930Test extends \PHPUnit_Framework_TestCase {
 		$census = new CensusOfDenmark1930;
 
 		$this->assertSame('Danmark', $census->censusPlace());
-		$this->assertSame('01 NOV 1930', $census->censusDate());
+		$this->assertSame('05 NOV 1930', $census->censusDate());
 	}
 
 	/**
@@ -64,8 +64,8 @@ class CensusOfDenmark1930Test extends \PHPUnit_Framework_TestCase {
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
 		$this->assertSame('Bopæl', $columns[1]->abbreviation());
-		$this->assertSame('', $columns[2]->abbreviation());
-		$this->assertSame('', $columns[3]->abbreviation());
+		$this->assertSame('Andetsteds', $columns[2]->abbreviation());
+		$this->assertSame('Stede', $columns[3]->abbreviation());
 		$this->assertSame('Bopæl', $columns[4]->abbreviation());
 		$this->assertSame('Køn', $columns[5]->abbreviation());
 		$this->assertSame('Fødselsdag', $columns[6]->abbreviation());
@@ -83,8 +83,8 @@ class CensusOfDenmark1930Test extends \PHPUnit_Framework_TestCase {
 
 		$this->assertSame('', $columns[0]->title());
 		$this->assertSame('', $columns[1]->title());
-		$this->assertSame('', $columns[2]->title());
-		$this->assertSame('', $columns[3]->title());
+		$this->assertSame('Hvis den i Rubrik 3 opførte Person har fast Bopæl andetsteds, anføres her den faste Bopæl', $columns[2]->title());
+		$this->assertSame('Hvis den i Rubrik 3 opførte Person paa Tællingsdagen til Stede paa Tællingsstedet? Ja eller Nej.', $columns[3]->title());
 		$this->assertSame('Bopæl den 5. Novbr. 1929', $columns[4]->title());
 		$this->assertSame('Kjønnet. Mandkøn (M) eller Kvindekøn (K).', $columns[5]->title());
 		$this->assertSame('', $columns[6]->title());
diff --git a/tests/app/Census/CensusOfDenmark1940Test.php b/tests/app/Census/CensusOfDenmark1940Test.php
index 0078df0891..e27f6ae54f 100644
--- a/tests/app/Census/CensusOfDenmark1940Test.php
+++ b/tests/app/Census/CensusOfDenmark1940Test.php
@@ -29,7 +29,7 @@ class CensusOfDenmark1940Test extends \PHPUnit_Framework_TestCase {
 		$census = new CensusOfDenmark1940;
 
 		$this->assertSame('Danmark', $census->censusPlace());
-		$this->assertSame('01 NOV 1940', $census->censusDate());
+		$this->assertSame('05 NOV 1940', $census->censusDate());
 	}
 
 	/**
@@ -60,35 +60,35 @@ class CensusOfDenmark1940Test extends \PHPUnit_Framework_TestCase {
 		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusColumnNull', $columns[14]);
 
 		$this->assertSame('Navn', $columns[0]->abbreviation());
-		$this->assertSame('', $columns[1]->abbreviation());
-		$this->assertSame('', $columns[2]->abbreviation());
+		$this->assertSame('Nærværende', $columns[1]->abbreviation());
+		$this->assertSame('Fraværende', $columns[2]->abbreviation());
 		$this->assertSame('Køn', $columns[3]->abbreviation());
 		$this->assertSame('Fødselsdag', $columns[4]->abbreviation());
 		$this->assertSame('Fødselsaar', $columns[5]->abbreviation());
 		$this->assertSame('Fødested', $columns[6]->abbreviation());
 		$this->assertSame('Statsbergerferhold', $columns[7]->abbreviation());
 		$this->assertSame('Civilstand', $columns[8]->abbreviation());
-		$this->assertSame('', $columns[9]->abbreviation());
+		$this->assertSame('Indgaaelse', $columns[9]->abbreviation());
 		$this->assertSame('Stilling i familien', $columns[10]->abbreviation());
 		$this->assertSame('Erhverv', $columns[11]->abbreviation());
-		$this->assertSame('', $columns[12]->abbreviation());
-		$this->assertSame('', $columns[13]->abbreviation());
-		$this->assertSame('', $columns[14]->abbreviation());
+		$this->assertSame('Virksomhedens', $columns[12]->abbreviation());
+		$this->assertSame('Hustruen', $columns[13]->abbreviation());
+		$this->assertSame('Døtre', $columns[14]->abbreviation());
 
 		$this->assertSame('', $columns[0]->title());
-		$this->assertSame('', $columns[1]->title());
-		$this->assertSame('', $columns[2]->title());
-		$this->assertSame('Kjønnet. Mandkøn (M) eller Kvindekøn (K).', $columns[3]->title());
+		$this->assertSame('Hvis den i Rubrik 1 opførte Person er midleritidg nærværende d.v.s. har fast Bopæl ????? (er optaget under en anden Address i Folkeregistret), anføres her den faste Bopæls Adresse (Kommunens Navn og den fuldstændige Adresse i denne; for Udlændinge dog kun Landets Navn).', $columns[1]->title());
+		$this->assertSame('Hvis den i Rubrik 1 opførte Person er midleritidg fraværende d.v.s. har fast Bopæl paa Tællingsstedet (er optaget underdenne Address i Folkeregistret), men den 5. Novemer ikke er til Stede paa Tællingsstedet, anføres her  „fraværende“ og Adressen paa det midlertidige Opholdssted (ved Ophold i Udlandet anføres jun Landets Navn).', $columns[2]->title());
+		$this->assertSame('Køn Mand (M) Kvinde (K)', $columns[3]->title());
 		$this->assertSame('', $columns[4]->title());
 		$this->assertSame('', $columns[5]->title());
 		$this->assertSame('', $columns[6]->title());
 		$this->assertSame('', $columns[7]->title());
 		$this->assertSame('Ægteskabelig Stillinge. Ugift (U), Gift (G), Enkemand eller Enke (E), Separeret (S), Fraskilt (F).', $columns[8]->title());
-		$this->assertSame('', $columns[9]->title());
+		$this->assertSame('Date for det nuværende Ægteskabs Indgaaelse.  NB." RUbrikken udfyldes ikke al Enkemaend, Enker, Separerede eller Fraskilte.', $columns[9]->title());
 		$this->assertSame('', $columns[10]->title());
 		$this->assertSame('', $columns[11]->title());
-		$this->assertSame('', $columns[12]->title());
-		$this->assertSame('', $columns[13]->title());
-		$this->assertSame('', $columns[14]->title());
+		$this->assertSame('Virksomhedens (Branchens) Art', $columns[12]->title());
+		$this->assertSame('Besvares kun af Hustruen og hjemmeboende Børn over 14 Aar', $columns[13]->title());
+		$this->assertSame('Besvares kun af hjemmeboende Døtre over 14 Aar', $columns[14]->title());
 	}
 }
diff --git a/tests/app/Census/CensusOfDenmarkTest.php b/tests/app/Census/CensusOfDenmarkTest.php
index 724e44dd3d..dde0bea706 100644
--- a/tests/app/Census/CensusOfDenmarkTest.php
+++ b/tests/app/Census/CensusOfDenmarkTest.php
@@ -41,7 +41,7 @@ class CensusOfDenmarkTest extends \PHPUnit_Framework_TestCase {
 
 		$census_dates = $census->allCensusDates();
 
-		$this->assertCount(23, $census_dates);
+		$this->assertCount(22, $census_dates);
 		$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]);
@@ -56,14 +56,13 @@ class CensusOfDenmarkTest extends \PHPUnit_Framework_TestCase {
 		$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\CensusOfDenmark1901', $census_dates[14]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1906', $census_dates[15]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1911', $census_dates[16]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1916', $census_dates[17]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1921', $census_dates[18]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1925', $census_dates[19]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1930', $census_dates[20]);
+		$this->assertInstanceOf('Fisharebest\Webtrees\Census\CensusOfDenmark1940', $census_dates[21]);
 	}
 }