Updated new metadata scheme
diff --git a/t/real_bzk_2.t b/t/real_bzk_2.t
new file mode 100644
index 0000000..89af4d8
--- /dev/null
+++ b/t/real_bzk_2.t
@@ -0,0 +1,266 @@
+#!/usr/bin/env perl
+# source ~/perl5/perlbrew/etc/bashrc
+# perlbrew switch perl-blead@korap
+use strict;
+use warnings;
+use Test::More;
+use Data::Dumper;
+use JSON::XS;
+
+use Benchmark qw/:hireswallclock/;
+
+my $t = Benchmark->new;
+
+use utf8;
+use lib 'lib', '../lib';
+
+use File::Basename 'dirname';
+use File::Spec::Functions 'catdir';
+
+use_ok('KorAP::Document');
+
+my $path = catdir(dirname(__FILE__), 'BZK/D59/00089');
+
+ok(my $doc = KorAP::Document->new( path => $path . '/' ), 'Load Korap::Document');
+ok($doc->parse, 'Parse document');
+
+is($doc->text_sigle, 'BZK_D59.00089', 'Correct text sigle');
+is($doc->doc_sigle, 'BZK_D59', 'Correct document sigle');
+is($doc->corpus_sigle, 'BZK', 'Correct corpus sigle');
+
+is($doc->title, 'Saragat-Partei zerfällt', 'Title');
+ok(!$doc->sub_title, 'No SubTitle');
+ok(!$doc->author, 'Author');
+ok(!$doc->editor, 'Editor');
+is($doc->pub_place, 'Berlin', 'PubPlace');
+is($doc->pub_date, '19590219', 'PubDate');
+ok(!$doc->publisher, 'Publisher');
+
+is($doc->text_type, 'Zeitung: Tageszeitung', 'Correct Text Type');
+
+ok(!$doc->text_type_art, 'Correct Text Type Art');
+is($doc->text_type_ref, 'Tageszeitung', 'Correct Text Type Ref');
+is($doc->text_domain, 'Politik', 'Correct Text Domain');
+is($doc->text_column, 'POLITIK', 'Correct Text Column');
+is($doc->text_class->[0], 'politik', 'Correct Text Class');
+is($doc->text_class->[1], 'ausland', 'Correct Text Class');
+ok(!$doc->text_class->[2], 'Correct Text Class');
+
+
+is($doc->creation_date, '19590219', 'Creation date');
+is($doc->license, 'ACA-NC-LC', 'License');
+ok(!$doc->pages, 'Pages');
+
+ok(!$doc->file_edition_statement, 'File Statement');
+ok(!$doc->bibl_edition_statement, 'Bibl Statement');
+
+is($doc->reference . "\n", <<'REF', 'Reference');
+Neues Deutschland, [Tageszeitung], 19.02.1959, Jg. 14, Berliner Ausgabe, S. 7. - Sachgebiet: Politik, Originalressort: POLITIK; Saragat-Partei zerfällt
+REF
+is($doc->language, 'de', 'Language');
+
+is($doc->corpus_title, 'Bonner Zeitungskorpus', 'Correct Corpus title');
+ok(!$doc->corpus_sub_title, 'Correct Corpus sub title');
+ok(!$doc->corpus_author, 'Correct Corpus author');
+ok(!$doc->corpus_editor, 'Correct Corpus editor');
+
+is($doc->doc_title, 'Neues Deutschland', 'Correct Doc title');
+is($doc->doc_sub_title, 'Organ des Zentralkomitees der Sozialistischen Einheitspartei Deutschlands', 'Correct Doc sub title');
+ok(!$doc->doc_author, 'Correct Doc author');
+ok(!$doc->doc_editor, 'Correct doc editor');
+
+# Tokenization
+use_ok('KorAP::Tokenizer');
+
+my ($token_base_foundry, $token_base_layer) = (qw/OpenNLP Tokens/);
+
+# Get tokenization
+my $tokens = KorAP::Tokenizer->new(
+ path => $doc->path,
+ doc => $doc,
+ foundry => $token_base_foundry,
+ layer => $token_base_layer,
+ name => 'tokens'
+);
+ok($tokens, 'Token Object is fine');
+ok($tokens->parse, 'Token parsing is fine');
+
+my $output = decode_json( $tokens->to_json );
+
+is(substr($output->{data}->{text}, 0, 100), 'Saragat-Partei zerfällt Rom (ADN) die von dem Rechtssozialisten Saragat geführte Sozialdemokratische', 'Primary Data');
+is($output->{data}->{name}, 'tokens', 'tokenName');
+is($output->{data}->{tokenSource}, 'opennlp#tokens', 'tokenSource');
+is($output->{version}, '0.02', 'version');
+is($output->{data}->{foundries}, '', 'Foundries');
+is($output->{data}->{layerInfos}, '', 'layerInfos');
+is($output->{data}->{stream}->[0]->[3], 's:Saragat-Partei', 'data');
+
+is($output->{textSigle}, 'BZK_D59.00089', 'Correct text sigle');
+is($output->{docSigle}, 'BZK_D59', 'Correct document sigle');
+is($output->{corpusSigle}, 'BZK', 'Correct corpus sigle');
+
+is($output->{title}, 'Saragat-Partei zerfällt', 'Title');
+ok(!exists $output->{subTitle}, 'No SubTitle');
+ok(!exists $output->{author}, 'Author');
+ok(!exists $output->{editor}, 'Publisher');
+
+is($output->{pubPlace}, 'Berlin', 'PubPlace');
+ok(!exists $output->{publisher}, 'Publisher');
+
+is($output->{textType}, 'Zeitung: Tageszeitung', 'Correct Text Type');
+ok(!exists $output->{textTypeArt}, 'Correct Text Type Art');
+is($output->{textTypeRef}, 'Tageszeitung', 'Correct Text Type Ref');
+is($output->{textDomain}, 'Politik', 'Correct Text Domain');
+is($output->{textClass}, 'politik ausland', 'Correct Text Domain');
+
+is($output->{creationDate}, '19590219', 'Creation date');
+is($output->{license}, 'ACA-NC-LC', 'License');
+ok(!exists $output->{pages}, 'Pages');
+ok(!exists $output->{fileEditionStatement}, 'File Statement');
+ok(!exists $output->{biblEditionStatement}, 'Bibl Statement');
+
+is($output->{reference} . "\n", <<'REF', 'Reference');
+Neues Deutschland, [Tageszeitung], 19.02.1959, Jg. 14, Berliner Ausgabe, S. 7. - Sachgebiet: Politik, Originalressort: POLITIK; Saragat-Partei zerfällt
+REF
+is($output->{language}, 'de', 'Language');
+
+is($output->{corpusTitle}, 'Bonner Zeitungskorpus', 'Correct Corpus title');
+ok(!exists $output->{corpusSubTitle}, 'Correct Corpus sub title');
+ok(!exists $output->{corpusAuthor}, 'Correct Corpus author');
+ok(!exists $output->{corpusEditor}, 'Correct Corpus editor');
+
+is($output->{docTitle}, 'Neues Deutschland', 'Correct Doc title');
+is($output->{docSubTitle}, 'Organ des Zentralkomitees der Sozialistischen Einheitspartei Deutschlands', 'Correct Doc sub title');
+ok(!exists $output->{docAuthor}, 'Correct Doc author');
+ok(!exists $output->{docEditor}, 'Correct doc editor');
+
+## Base
+$tokens->add('Base', 'Sentences');
+$tokens->add('Base', 'Paragraphs');
+
+$output = decode_json( $tokens->to_json );
+
+is($output->{data}->{foundries}, 'base base/paragraphs base/sentences', 'Foundries');
+is($output->{data}->{layerInfos}, 'base/s=spans', 'layerInfos');
+my $first_token = join('||', @{$output->{data}->{stream}->[0]});
+like($first_token, qr/s:Saragat-Partei/, 'data');
+like($first_token, qr/_0#0-14/, 'data');
+
+## OpenNLP
+$tokens->add('OpenNLP', 'Sentences');
+
+$output = decode_json( $tokens->to_json );
+is($output->{data}->{foundries},
+ 'base base/paragraphs base/sentences opennlp opennlp/sentences',
+ 'Foundries');
+is($output->{data}->{layerInfos}, 'base/s=spans opennlp/s=spans', 'layerInfos');
+
+$tokens->add('OpenNLP', 'Morpho');
+$output = decode_json( $tokens->to_json );
+is($output->{data}->{foundries},
+ 'base base/paragraphs base/sentences opennlp opennlp/morpho opennlp/sentences',
+ 'Foundries');
+is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans', 'layerInfos');
+
+## Treetagger
+$tokens->add('TreeTagger', 'Sentences');
+$output = decode_json( $tokens->to_json );
+is($output->{data}->{foundries},
+ 'base base/paragraphs base/sentences opennlp opennlp/morpho opennlp/sentences treetagger treetagger/sentences',
+ 'Foundries');
+is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans tt/s=spans', 'layerInfos');
+
+$tokens->add('TreeTagger', 'Morpho');
+$output = decode_json( $tokens->to_json );
+is($output->{data}->{foundries},
+ 'base base/paragraphs base/sentences opennlp opennlp/morpho opennlp/sentences treetagger treetagger/morpho treetagger/sentences',
+ 'Foundries');
+is($output->{data}->{layerInfos}, 'base/s=spans opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans', 'layerInfos');
+
+## CoreNLP
+$tokens->add('CoreNLP', 'NamedEntities');
+$output = decode_json( $tokens->to_json );
+is($output->{data}->{foundries},
+ 'base base/paragraphs base/sentences corenlp corenlp/namedentities opennlp opennlp/morpho opennlp/sentences treetagger treetagger/morpho treetagger/sentences',
+ 'Foundries');
+is($output->{data}->{layerInfos}, 'base/s=spans corenlp/ne=tokens opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans', 'layerInfos');
+
+$tokens->add('CoreNLP', 'Sentences');
+$output = decode_json( $tokens->to_json );
+is($output->{data}->{foundries},
+ 'base base/paragraphs base/sentences corenlp corenlp/namedentities corenlp/sentences opennlp opennlp/morpho opennlp/sentences treetagger treetagger/morpho treetagger/sentences',
+ 'Foundries');
+is($output->{data}->{layerInfos}, 'base/s=spans corenlp/ne=tokens corenlp/s=spans opennlp/p=tokens opennlp/s=spans tt/l=tokens tt/p=tokens tt/s=spans', 'layerInfos');
+
+$tokens->add('CoreNLP', 'Morpho');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!corenlp/morpho!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!corenlp/p=tokens!, 'layerInfos');
+
+$tokens->add('CoreNLP', 'Constituency');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!corenlp/constituency!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!corenlp/c=spans!, 'layerInfos');
+
+## Glemm
+$tokens->add('Glemm', 'Morpho');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!glemm/morpho!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!glemm/l=tokens!, 'layerInfos');
+
+## Connexor
+$tokens->add('Connexor', 'Sentences');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!connexor/sentences!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!cnx/s=spans!, 'layerInfos');
+
+$tokens->add('Connexor', 'Morpho');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!connexor/morpho!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!cnx/p=tokens!, 'layerInfos');
+like($output->{data}->{layerInfos}, qr!cnx/l=tokens!, 'layerInfos');
+like($output->{data}->{layerInfos}, qr!cnx/m=tokens!, 'layerInfos');
+
+$tokens->add('Connexor', 'Phrase');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!connexor/phrase!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!cnx/c=spans!, 'layerInfos');
+
+$tokens->add('Connexor', 'Syntax');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!connexor/syntax!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!cnx/syn=tokens!, 'layerInfos');
+
+## Mate
+$tokens->add('Mate', 'Morpho');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!mate/morpho!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!mate/p=tokens!, 'layerInfos');
+like($output->{data}->{layerInfos}, qr!mate/l=tokens!, 'layerInfos');
+like($output->{data}->{layerInfos}, qr!mate/m=tokens!, 'layerInfos');
+
+diag "No test for mate dependency";
+
+## XIP
+$tokens->add('XIP', 'Sentences');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!xip/sentences!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!xip/s=spans!, 'layerInfos');
+
+$tokens->add('XIP', 'Morpho');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!xip/morpho!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!xip/l=tokens!, 'layerInfos');
+like($output->{data}->{layerInfos}, qr!xip/p=tokens!, 'layerInfos');
+
+
+$tokens->add('XIP', 'Constituency');
+$output = decode_json( $tokens->to_json );
+like($output->{data}->{foundries}, qr!xip/constituency!, 'Foundries');
+like($output->{data}->{layerInfos}, qr!xip/c=spans!, 'layerInfos');
+
+diag "No test for xip dependency";
+
+
+done_testing;
+__END__