diff --git a/t/meta.t b/t/meta.t
index c8de4bd..87180de 100644
--- a/t/meta.t
+++ b/t/meta.t
@@ -26,8 +26,8 @@
 # Metdata
 is($doc->title, 'A', 'title');
 ok(!$doc->sub_title, 'subTitle');
-is($doc->id, 'WPD_AAA.00001', 'ID');
-is($doc->corpus_id, 'WPD', 'corpusID');
+is($doc->text_sigle, 'WPD_AAA.00001', 'ID');
+is($doc->corpus_sigle, 'WPD', 'corpusID');
 is($doc->pub_date, '20050328', 'pubDate');
 is($doc->pub_place, 'URL:http://de.wikipedia.org', 'pubPlace');
 is($doc->text_class->[0], 'freizeit-unterhaltung', 'TextClass');
@@ -41,7 +41,7 @@
 ok(!$doc->author->[3], 'author');
 
 # Additional information
-ok(!$doc->editor, 'Editor');
+is($doc->editor,'wikipedia.org', 'Editor');
 is($doc->publisher, 'Wikipedia', 'Publisher');
 is($doc->creation_date, '20050000', 'Creation date');
 is($doc->coll_title, 'Wikipedia', 'Collection title');
@@ -58,8 +58,8 @@
 ok($doc->parse, 'Parse document');
 is($doc->title, 'Sexueller Missbrauch –„Das schreiende Kind steckt noch tief in mir“', 'title');
 ok(!$doc->sub_title, 'subTitle');
-is($doc->id, 'BRZ13_APR.00001', 'ID');
-is($doc->corpus_id, 'BRZ13', 'corpusID');
+is($doc->text_sigle, 'BRZ13_APR.00001', 'ID');
+is($doc->corpus_sigle, 'BRZ13', 'corpusID');
 is($doc->pub_date, '20130402', 'pubDate');
 is($doc->pub_place, 'Braunschweig', 'pubPlace');
 is($doc->text_class->[0], 'staat-gesellschaft', 'TextClass');
@@ -85,8 +85,8 @@
 ok($doc->parse, 'Parse document');
 is($doc->title, 'Fischer und Kolp im Sonnenhügel', 'title');
 ok(!$doc->sub_title, 'subTitle');
-is($doc->id, 'A01_APR.13047', 'ID');
-is($doc->corpus_id, 'A01', 'corpusID');
+is($doc->text_sigle, 'A01_APR.13047', 'ID');
+is($doc->corpus_sigle, 'A01', 'corpusID');
 is($doc->pub_date, '20010402', 'pubDate');
 ok(!$doc->pub_place, 'pubPlace');
 is($doc->text_class->[0], 'freizeit-unterhaltung', 'TextClass');
@@ -114,8 +114,8 @@
 ok($doc->parse, 'Parse document');
 is($doc->title, 'Amtsblatt des Landesbezirks Baden [diverse Erlasse]', 'title');
 ok(!$doc->sub_title, 'subTitle');
-is($doc->id, 'MK2_ERL.00001', 'ID');
-is($doc->corpus_id, 'MK2', 'corpusID');
+is($doc->text_sigle, 'MK2_ERL.00001', 'ID');
+is($doc->corpus_sigle, 'MK2', 'corpusID');
 is($doc->pub_date, '00000000', 'pubDate');
 is($doc->pub_place, 'Karlsruhe', 'pubPlace');
 is($doc->text_class->[0], 'politik', 'TextClass');
@@ -126,7 +126,7 @@
 # Additional information
 ok(!$doc->editor, 'Editor');
 is($doc->publisher, 'Badenia Verlag und Druckerei', 'Publisher');
-ok(!$doc->creation_date, 'Creation date');
+is($doc->creation_date, '19600000', 'Creation date');
 diag 'Non-acceptance of creation date ranges is temporary';
 ok(!$doc->coll_title, 'Collection title');
 ok(!$doc->coll_sub_title, 'Collection subtitle');
@@ -143,8 +143,8 @@
 ok($doc->parse, 'Parse document');
 ok(!$doc->title, 'title');
 ok(!$doc->sub_title, 'subTitle');
-is($doc->id, 'A00_JAN.02035', 'ID');
-is($doc->corpus_id, 'A00', 'corpusID');
+is($doc->text_sigle, 'A00_JAN.02035', 'ID');
+is($doc->corpus_sigle, 'A00', 'corpusID');
 is($doc->pub_date, '20000111', 'pubDate');
 ok(!$doc->pub_place, 'pubPlace');
 is($doc->text_class->[0], 'sport', 'TextClass');
@@ -171,8 +171,8 @@
 ok($doc->parse, 'Parse document');
 is($doc->title, 'Tradition und Moderne', 'title');
 ok(!$doc->sub_title, 'subTitle');
-is($doc->id, 'A00_JAN.02873', 'ID');
-is($doc->corpus_id, 'A00', 'corpusID');
+is($doc->text_sigle, 'A00_JAN.02873', 'ID');
+is($doc->corpus_sigle, 'A00', 'corpusID');
 is($doc->pub_date, '20000113', 'pubDate');
 ok(!$doc->pub_place, 'pubPlace');
 is($doc->text_class->[0], 'kultur', 'TextClass');
@@ -199,8 +199,8 @@
 ok($doc->parse, 'Parse document');
 is($doc->title, 'Mehr Arbeitslose im Dezember', 'title');
 ok(!$doc->sub_title, 'subTitle');
-is($doc->id, 'A00_JAN.05663', 'ID');
-is($doc->corpus_id, 'A00', 'corpusID');
+is($doc->text_sigle, 'A00_JAN.05663', 'ID');
+is($doc->corpus_sigle, 'A00', 'corpusID');
 is($doc->pub_date, '20000124', 'pubDate');
 ok(!$doc->pub_place, 'pubPlace');
 is($doc->text_class->[0], 'gesundheit-ernaehrung', 'TextClass');
@@ -228,8 +228,8 @@
 ok($doc->parse, 'Parse document');
 is($doc->title, 'Wil im Dezember 1999', 'title');
 ok(!$doc->sub_title, 'subTitle');
-is($doc->id, 'A00_JAN.07452', 'ID');
-is($doc->corpus_id, 'A00', 'corpusID');
+is($doc->text_sigle, 'A00_JAN.07452', 'ID');
+is($doc->corpus_sigle, 'A00', 'corpusID');
 is($doc->pub_date, '20000129', 'pubDate');
 ok(!$doc->pub_place, 'pubPlace');
 is($doc->text_class->[0], 'politik', 'TextClass');
@@ -261,8 +261,8 @@
 # Metdata
 is($doc->title, 'Artificial Title', 'title');
 is($doc->sub_title, 'Artificial Subtitle', 'subTitle');
-is($doc->id, 'ART_00001', 'ID');
-is($doc->corpus_id, 'ART', 'corpusID');
+is($doc->text_sigle, 'ART_ABC.00001', 'ID');
+is($doc->corpus_sigle, 'ART', 'corpusID');
 is($doc->pub_date, '20010402', 'pubDate');
 is($doc->pub_place, 'Mannheim', 'pubPlace');
 is($doc->text_class->[0], 'freizeit-unterhaltung', 'TextClass');