diff --git a/t/real/bzk.t b/t/real/bzk.t
index 8999cc5..76d01ca 100644
--- a/t/real/bzk.t
+++ b/t/real/bzk.t
@@ -21,8 +21,8 @@
 ok(my $doc = KorAP::XML::Krill->new( path => $path . '/' ), 'Load Korap::Document');
 ok($doc->parse, 'Parse document');
 
-is($doc->text_sigle, 'BZK_D59.00001', 'Correct text sigle');
-is($doc->doc_sigle, 'BZK_D59', 'Correct document sigle');
+is($doc->text_sigle, 'BZK/D59/00001', 'Correct text sigle');
+is($doc->doc_sigle, 'BZK/D59', 'Correct document sigle');
 is($doc->corpus_sigle, 'BZK', 'Correct corpus sigle');
 
 my $meta = $doc->meta;
@@ -92,8 +92,8 @@
 is($output->{data}->{layerInfos}, '', 'layerInfos');
 is($output->{data}->{stream}->[0]->[4], 's:unser', 'data');
 
-is($output->{textSigle}, 'BZK_D59.00001', 'Correct text sigle');
-is($output->{docSigle}, 'BZK_D59', 'Correct document sigle');
+is($output->{textSigle}, 'BZK/D59/00001', 'Correct text sigle');
+is($output->{docSigle}, 'BZK/D59', 'Correct document sigle');
 is($output->{corpusSigle}, 'BZK', 'Correct corpus sigle');
 
 is($output->{title}, 'Unser gemeinsames Werk wird siegreich sein', 'Title');
diff --git a/t/real/bzk_2.t b/t/real/bzk_2.t
index a44806b..4597541 100644
--- a/t/real/bzk_2.t
+++ b/t/real/bzk_2.t
@@ -21,8 +21,8 @@
 ok(my $doc = KorAP::XML::Krill->new( path => $path . '/' ), 'Load Korap::XML::Krill');
 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->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');
 
 my $meta = $doc->meta;
@@ -93,8 +93,8 @@
 is($output->{data}->{layerInfos}, '', 'layerInfos');
 is($output->{data}->{stream}->[0]->[4], 's:Saragat-Partei', 'data');
 
-is($output->{textSigle}, 'BZK_D59.00089', 'Correct text sigle');
-is($output->{docSigle}, 'BZK_D59', 'Correct document sigle');
+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');
diff --git a/t/real/goethe.t b/t/real/goethe.t
index 9769af7..07d4eae 100644
--- a/t/real/goethe.t
+++ b/t/real/goethe.t
@@ -23,8 +23,8 @@
 ok(my $doc = KorAP::XML::Krill->new( path => $path . '/' ), 'Load Korap::Document');
 ok($doc->parse, 'Parse document');
 
-is($doc->text_sigle, 'GOE_AGA.03828', 'Correct text sigle');
-is($doc->doc_sigle, 'GOE_AGA', 'Correct document sigle');
+is($doc->text_sigle, 'GOE/AGA/03828', 'Correct text sigle');
+is($doc->doc_sigle, 'GOE/AGA', 'Correct document sigle');
 is($doc->corpus_sigle, 'GOE', 'Correct corpus sigle');
 
 my $meta = $doc->meta;
@@ -89,8 +89,8 @@
 is($output->{data}->{layerInfos}, '', 'layerInfos');
 is($output->{data}->{stream}->[0]->[4], 's:Autobiographische', 'data');
 
-is($output->{textSigle}, 'GOE_AGA.03828', 'Correct text sigle');
-is($output->{docSigle}, 'GOE_AGA', 'Correct document sigle');
+is($output->{textSigle}, 'GOE/AGA/03828', 'Correct text sigle');
+is($output->{docSigle}, 'GOE/AGA', 'Correct document sigle');
 is($output->{corpusSigle}, 'GOE', 'Correct corpus sigle');
 
 is($output->{author}, 'Goethe, Johann Wolfgang von', 'Author');
diff --git a/t/real/wdd.t b/t/real/wdd.t
index 71d16d4..eb5db64 100644
--- a/t/real/wdd.t
+++ b/t/real/wdd.t
@@ -22,8 +22,8 @@
 ok(my $doc = KorAP::XML::Krill->new( path => $path . '/' ), 'Load Korap::Document');
 ok($doc->parse, 'Parse document');
 
-is($doc->text_sigle, 'WDD11_G27.38989', 'Correct text sigle');
-is($doc->doc_sigle, 'WDD11_G27', 'Correct document sigle');
+is($doc->text_sigle, 'WDD11/G27/38989', 'Correct text sigle');
+is($doc->doc_sigle, 'WDD11/G27', 'Correct document sigle');
 is($doc->corpus_sigle, 'WDD11', 'Correct corpus sigle');
 
 my $meta = $doc->meta;
@@ -84,8 +84,8 @@
 is($output->{data}->{layerInfos}, '', 'layerInfos');
 is($output->{data}->{stream}->[0]->[4], 's:{War', 'data');
 
-is($output->{textSigle}, 'WDD11_G27.38989', 'Correct text sigle');
-is($output->{docSigle}, 'WDD11_G27', 'Correct document sigle');
+is($output->{textSigle}, 'WDD11/G27/38989', 'Correct text sigle');
+is($output->{docSigle}, 'WDD11/G27', 'Correct document sigle');
 is($output->{corpusSigle}, 'WDD11', 'Correct corpus sigle');
 
 is($output->{title}, 'Diskussion:Gunter A. Pilz', 'Title');
diff --git a/t/real/wpd.t b/t/real/wpd.t
index 1cf1711..f6293c2 100644
--- a/t/real/wpd.t
+++ b/t/real/wpd.t
@@ -18,13 +18,12 @@
 
 # GOE/AGA/03828
 my $path = catdir(dirname(__FILE__), '../corpus/WPD/00001');
-# my $path = '/home/ndiewald/Repositories/korap/KorAP-sandbox/KorAP-lucene-indexer/t/GOE/AGA/03828';
 
 ok(my $doc = KorAP::XML::Krill->new( path => $path . '/' ), 'Load Korap::Document');
 ok($doc->parse, 'Parse document');
 
-is($doc->text_sigle, 'WPD_AAA.00001', 'Correct text sigle');
-is($doc->doc_sigle, 'WPD_AAA', 'Correct document sigle');
+is($doc->text_sigle, 'WPD/AAA/00001', 'Correct text sigle');
+is($doc->doc_sigle, 'WPD/AAA', 'Correct document sigle');
 is($doc->corpus_sigle, 'WPD', 'Correct corpus sigle');
 
 my $meta = $doc->meta;