diff --git a/src/test/resources/queries/bsp14.json b/src/test/resources/queries/bsp14.json
index 6737c80..b76110c 100644
--- a/src/test/resources/queries/bsp14.json
+++ b/src/test/resources/queries/bsp14.json
@@ -24,7 +24,7 @@
             "@subtype": "korap:regex", 
             "@value": "'vers{2,3}uch'", 
             "relation": "=", 
-            "type": "korap:term"
+            "@type": "korap:term"
         }
     }
 }
diff --git a/src/test/resources/queries/bsp15.json b/src/test/resources/queries/bsp15.json
index 371820c..c287d88 100644
--- a/src/test/resources/queries/bsp15.json
+++ b/src/test/resources/queries/bsp15.json
@@ -21,7 +21,7 @@
     "query": {
         "@type": "korap:token", 
         "@value": {
-            "@subtype": "korap:value#regex", 
+            "@subtype": "korap:regex", 
             "@type": "korap:term", 
             "@value": "orth:'vers.*ch'", 
             "relation": "="
diff --git a/src/test/resources/queries/readme.txt b/src/test/resources/queries/readme.txt
index 60a54f7..5fa4709 100644
--- a/src/test/resources/queries/readme.txt
+++ b/src/test/resources/queries/readme.txt
@@ -1,18 +1,18 @@
-bsp1.json: [base=foo]|([base=foo][base=bar])* meta author=Goethe&year=1815
-bsp2.json: ([base=foo]|[base=bar])[base=foobar]
-bsp3.json: shrink({[base=Mann]})
-bsp4.json: shrink({[base=foo]}[orth=bar])
-bsp5.json: shrink(1:[base=Der]{1:[base=Mann]}) 
-bsp6.json: [base=Katze]
-bsp7.json: [base!=Katze]
-bsp8.json: [!base=Katze]
-bsp9.json: [base=Katze&orth=Katzen]
-bsp10.json:	[base=Katze][orth=und][orth=Hunde]
-bsp11.json:	[!(base=Katze&orth=Katzen)]
-bsp12.json:	contains(<np>,[base=Mann])
-bsp13.json:	startswith(<np>,[!pos=Det])
-bsp13b.json:	startswith(<np>,[pos=Det])
-bsp14.json:	'vers{2,3}uch'
-bsp15.json:	[orth='vers.*ch']
-bsp16.json: [(base=bar|base=foo)&orth=foobar]
-bsp17.json:	within(<np>,[base=Mann])
+bsp1.json:   [base=foo]|([base=foo][base=bar])* meta author=Goethe&year=1815
+bsp2.json:   ([base=foo]|[base=bar])[base=foobar]
+bsp3.json:   shrink({[base=Mann]})
+bsp4.json:   shrink({[base=foo]}[orth=bar])
+bsp5.json:   shrink(1:[base=Der]{1:[base=Mann]}) 
+bsp6.json:   [base=Katze]
+bsp7.json:   [base!=Katze]
+bsp8.json:   [!base=Katze]
+bsp9.json:   [base=Katze&orth=Katzen]
+bsp10.json:  [base=Katze][orth=und][orth=Hunde]
+bsp11.json:  [!(base=Katze&orth=Katzen)]
+bsp12.json:  contains(<np>,[base=Mann])
+bsp13.json:  startswith(<np>,[!pos=Det])
+bsp13b.json: startswith(<np>,[pos=Det])
+bsp14.json:  'vers{2,3}uch'
+bsp15.json:  [orth='vers.*ch']
+bsp16.json:  [(base=bar|base=foo)&orth=foobar]
+bsp17.json:  within(<np>,[base=Mann])