1184 files changed, 38 insertions, 32 deletions

diff --git a/NEWS b/NEWS
index 6bbc7582..deea87ba 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+serd (0.30.7) unstable;
+
+  * Split up and reorganize unit tests
+
+ -- David Robillard <d@drobilla.net>  Mon, 09 Nov 2020 19:00:39 +0000
+
 serd (0.30.6) stable;
 
   * Fix various minor warnings and other code quality issues
diff --git a/tests/NQuadsTests/README b/test/NQuadsTests/README
index 7aef79dd..7aef79dd 100644
--- a/tests/NQuadsTests/README
+++ b/test/NQuadsTests/README
diff --git a/tests/NQuadsTests/comment_following_triple.nq b/test/NQuadsTests/comment_following_triple.nq
index 5619459a..5619459a 100644
--- a/tests/NQuadsTests/comment_following_triple.nq
+++ b/test/NQuadsTests/comment_following_triple.nq
diff --git a/tests/NQuadsTests/langtagged_string.nq b/test/NQuadsTests/langtagged_string.nq
index 1bddb04e..1bddb04e 100644
--- a/tests/NQuadsTests/langtagged_string.nq
+++ b/test/NQuadsTests/langtagged_string.nq
diff --git a/tests/NQuadsTests/lantag_with_subtag.nq b/test/NQuadsTests/lantag_with_subtag.nq
index 629cbf42..629cbf42 100644
--- a/tests/NQuadsTests/lantag_with_subtag.nq
+++ b/test/NQuadsTests/lantag_with_subtag.nq
diff --git a/tests/NQuadsTests/literal.nq b/test/NQuadsTests/literal.nq
index 3aba89e4..3aba89e4 100644
--- a/tests/NQuadsTests/literal.nq
+++ b/test/NQuadsTests/literal.nq
diff --git a/tests/NQuadsTests/literal_all_controls.nq b/test/NQuadsTests/literal_all_controls.nq
index 91c8af14..91c8af14 100644
--- a/tests/NQuadsTests/literal_all_controls.nq
+++ b/test/NQuadsTests/literal_all_controls.nq
diff --git a/tests/NQuadsTests/literal_all_punctuation.nq b/test/NQuadsTests/literal_all_punctuation.nq
index c25d818f..c25d818f 100644
--- a/tests/NQuadsTests/literal_all_punctuation.nq
+++ b/test/NQuadsTests/literal_all_punctuation.nq
diff --git a/tests/NQuadsTests/literal_ascii_boundaries.nq b/test/NQuadsTests/literal_ascii_boundaries.nq
index 7a4dc717..7a4dc717 100644
--- a/tests/NQuadsTests/literal_ascii_boundaries.nq
+++ b/test/NQuadsTests/literal_ascii_boundaries.nq
diff --git a/tests/NQuadsTests/literal_false.nq b/test/NQuadsTests/literal_false.nq
index 5bbbae84..5bbbae84 100644
--- a/tests/NQuadsTests/literal_false.nq
+++ b/test/NQuadsTests/literal_false.nq
diff --git a/tests/NQuadsTests/literal_true.nq b/test/NQuadsTests/literal_true.nq
index 054b229f..054b229f 100644
--- a/tests/NQuadsTests/literal_true.nq
+++ b/test/NQuadsTests/literal_true.nq
diff --git a/tests/NQuadsTests/literal_with_2_dquotes.nq b/test/NQuadsTests/literal_with_2_dquotes.nq
index 3e69dc10..3e69dc10 100644
--- a/tests/NQuadsTests/literal_with_2_dquotes.nq
+++ b/test/NQuadsTests/literal_with_2_dquotes.nq
diff --git a/tests/NQuadsTests/literal_with_2_squotes.nq b/test/NQuadsTests/literal_with_2_squotes.nq
index 8ddc52e8..8ddc52e8 100644
--- a/tests/NQuadsTests/literal_with_2_squotes.nq
+++ b/test/NQuadsTests/literal_with_2_squotes.nq
diff --git a/tests/NQuadsTests/literal_with_BACKSPACE.nq b/test/NQuadsTests/literal_with_BACKSPACE.nq
index 339013df..339013df 100644
--- a/tests/NQuadsTests/literal_with_BACKSPACE.nq
+++ b/test/NQuadsTests/literal_with_BACKSPACE.nq
diff --git a/tests/NQuadsTests/literal_with_CARRIAGE_RETURN.nq b/test/NQuadsTests/literal_with_CARRIAGE_RETURN.nq
index 91b85c89..91b85c89 100644
--- a/tests/NQuadsTests/literal_with_CARRIAGE_RETURN.nq
+++ b/test/NQuadsTests/literal_with_CARRIAGE_RETURN.nq
diff --git a/tests/NQuadsTests/literal_with_CHARACTER_TABULATION.nq b/test/NQuadsTests/literal_with_CHARACTER_TABULATION.nq
index a6a9d9f0..a6a9d9f0 100644
--- a/tests/NQuadsTests/literal_with_CHARACTER_TABULATION.nq
+++ b/test/NQuadsTests/literal_with_CHARACTER_TABULATION.nq
diff --git a/tests/NQuadsTests/literal_with_FORM_FEED.nq b/test/NQuadsTests/literal_with_FORM_FEED.nq
index 10d2c6d7..10d2c6d7 100644
--- a/tests/NQuadsTests/literal_with_FORM_FEED.nq
+++ b/test/NQuadsTests/literal_with_FORM_FEED.nq
diff --git a/tests/NQuadsTests/literal_with_LINE_FEED.nq b/test/NQuadsTests/literal_with_LINE_FEED.nq
index 462f97ac..462f97ac 100644
--- a/tests/NQuadsTests/literal_with_LINE_FEED.nq
+++ b/test/NQuadsTests/literal_with_LINE_FEED.nq
diff --git a/tests/NQuadsTests/literal_with_REVERSE_SOLIDUS.nq b/test/NQuadsTests/literal_with_REVERSE_SOLIDUS.nq
index ebc846ed..ebc846ed 100644
--- a/tests/NQuadsTests/literal_with_REVERSE_SOLIDUS.nq
+++ b/test/NQuadsTests/literal_with_REVERSE_SOLIDUS.nq
diff --git a/tests/NQuadsTests/literal_with_REVERSE_SOLIDUS2.nq b/test/NQuadsTests/literal_with_REVERSE_SOLIDUS2.nq
index 586e364d..586e364d 100644
--- a/tests/NQuadsTests/literal_with_REVERSE_SOLIDUS2.nq
+++ b/test/NQuadsTests/literal_with_REVERSE_SOLIDUS2.nq
diff --git a/tests/NQuadsTests/literal_with_UTF8_boundaries.nq b/test/NQuadsTests/literal_with_UTF8_boundaries.nq
index 0e1616db..0e1616db 100644
--- a/tests/NQuadsTests/literal_with_UTF8_boundaries.nq
+++ b/test/NQuadsTests/literal_with_UTF8_boundaries.nq
diff --git a/tests/NQuadsTests/literal_with_dquote.nq b/test/NQuadsTests/literal_with_dquote.nq
index 05a1fd3a..05a1fd3a 100644
--- a/tests/NQuadsTests/literal_with_dquote.nq
+++ b/test/NQuadsTests/literal_with_dquote.nq
diff --git a/tests/NQuadsTests/literal_with_numeric_escape4.nq b/test/NQuadsTests/literal_with_numeric_escape4.nq
index 16f0a036..16f0a036 100644
--- a/tests/NQuadsTests/literal_with_numeric_escape4.nq
+++ b/test/NQuadsTests/literal_with_numeric_escape4.nq
diff --git a/tests/NQuadsTests/literal_with_numeric_escape8.nq b/test/NQuadsTests/literal_with_numeric_escape8.nq
index e909a79d..e909a79d 100644
--- a/tests/NQuadsTests/literal_with_numeric_escape8.nq
+++ b/test/NQuadsTests/literal_with_numeric_escape8.nq
diff --git a/tests/NQuadsTests/literal_with_squote.nq b/test/NQuadsTests/literal_with_squote.nq
index acf7f58f..acf7f58f 100644
--- a/tests/NQuadsTests/literal_with_squote.nq
+++ b/test/NQuadsTests/literal_with_squote.nq
diff --git a/tests/NQuadsTests/manifest.ttl b/test/NQuadsTests/manifest.ttl
index eb5f5508..eb5f5508 100644
--- a/tests/NQuadsTests/manifest.ttl
+++ b/test/NQuadsTests/manifest.ttl
diff --git a/tests/NQuadsTests/minimal_whitespace.nq b/test/NQuadsTests/minimal_whitespace.nq
index e9e3a801..e9e3a801 100644
--- a/tests/NQuadsTests/minimal_whitespace.nq
+++ b/test/NQuadsTests/minimal_whitespace.nq
diff --git a/tests/NQuadsTests/nq-syntax-bad-literal-01.nq b/test/NQuadsTests/nq-syntax-bad-literal-01.nq
index bb17eb37..bb17eb37 100644
--- a/tests/NQuadsTests/nq-syntax-bad-literal-01.nq
+++ b/test/NQuadsTests/nq-syntax-bad-literal-01.nq
diff --git a/tests/NQuadsTests/nq-syntax-bad-literal-02.nq b/test/NQuadsTests/nq-syntax-bad-literal-02.nq
index ea303b28..ea303b28 100644
--- a/tests/NQuadsTests/nq-syntax-bad-literal-02.nq
+++ b/test/NQuadsTests/nq-syntax-bad-literal-02.nq
diff --git a/tests/NQuadsTests/nq-syntax-bad-literal-03.nq b/test/NQuadsTests/nq-syntax-bad-literal-03.nq
index 854b867f..854b867f 100644
--- a/tests/NQuadsTests/nq-syntax-bad-literal-03.nq
+++ b/test/NQuadsTests/nq-syntax-bad-literal-03.nq
diff --git a/tests/NQuadsTests/nq-syntax-bad-quint-01.nq b/test/NQuadsTests/nq-syntax-bad-quint-01.nq
index 52b7581e..52b7581e 100644
--- a/tests/NQuadsTests/nq-syntax-bad-quint-01.nq
+++ b/test/NQuadsTests/nq-syntax-bad-quint-01.nq
diff --git a/tests/NQuadsTests/nq-syntax-bad-uri-01.nq b/test/NQuadsTests/nq-syntax-bad-uri-01.nq
index 3bf4dbd0..3bf4dbd0 100644
--- a/tests/NQuadsTests/nq-syntax-bad-uri-01.nq
+++ b/test/NQuadsTests/nq-syntax-bad-uri-01.nq
diff --git a/tests/NQuadsTests/nq-syntax-bnode-01.nq b/test/NQuadsTests/nq-syntax-bnode-01.nq
index b7acbd5c..b7acbd5c 100644
--- a/tests/NQuadsTests/nq-syntax-bnode-01.nq
+++ b/test/NQuadsTests/nq-syntax-bnode-01.nq
diff --git a/tests/NQuadsTests/nq-syntax-bnode-02.nq b/test/NQuadsTests/nq-syntax-bnode-02.nq
index 07c92637..07c92637 100644
--- a/tests/NQuadsTests/nq-syntax-bnode-02.nq
+++ b/test/NQuadsTests/nq-syntax-bnode-02.nq
diff --git a/tests/NQuadsTests/nq-syntax-bnode-03.nq b/test/NQuadsTests/nq-syntax-bnode-03.nq
index 5f89bd96..5f89bd96 100644
--- a/tests/NQuadsTests/nq-syntax-bnode-03.nq
+++ b/test/NQuadsTests/nq-syntax-bnode-03.nq
diff --git a/tests/NQuadsTests/nq-syntax-bnode-04.nq b/test/NQuadsTests/nq-syntax-bnode-04.nq
index f89ca814..f89ca814 100644
--- a/tests/NQuadsTests/nq-syntax-bnode-04.nq
+++ b/test/NQuadsTests/nq-syntax-bnode-04.nq
diff --git a/tests/NQuadsTests/nq-syntax-bnode-05.nq b/test/NQuadsTests/nq-syntax-bnode-05.nq
index 9bb45ce6..9bb45ce6 100644
--- a/tests/NQuadsTests/nq-syntax-bnode-05.nq
+++ b/test/NQuadsTests/nq-syntax-bnode-05.nq
diff --git a/tests/NQuadsTests/nq-syntax-bnode-06.nq b/test/NQuadsTests/nq-syntax-bnode-06.nq
index 194ffdc2..194ffdc2 100644
--- a/tests/NQuadsTests/nq-syntax-bnode-06.nq
+++ b/test/NQuadsTests/nq-syntax-bnode-06.nq
diff --git a/tests/NQuadsTests/nq-syntax-uri-01.nq b/test/NQuadsTests/nq-syntax-uri-01.nq
index 3026e122..3026e122 100644
--- a/tests/NQuadsTests/nq-syntax-uri-01.nq
+++ b/test/NQuadsTests/nq-syntax-uri-01.nq
diff --git a/tests/NQuadsTests/nq-syntax-uri-02.nq b/test/NQuadsTests/nq-syntax-uri-02.nq
index 1590ab94..1590ab94 100644
--- a/tests/NQuadsTests/nq-syntax-uri-02.nq
+++ b/test/NQuadsTests/nq-syntax-uri-02.nq
diff --git a/tests/NQuadsTests/nq-syntax-uri-03.nq b/test/NQuadsTests/nq-syntax-uri-03.nq
index 4592edcb..4592edcb 100644
--- a/tests/NQuadsTests/nq-syntax-uri-03.nq
+++ b/test/NQuadsTests/nq-syntax-uri-03.nq
diff --git a/tests/NQuadsTests/nq-syntax-uri-04.nq b/test/NQuadsTests/nq-syntax-uri-04.nq
index f7b834ab..f7b834ab 100644
--- a/tests/NQuadsTests/nq-syntax-uri-04.nq
+++ b/test/NQuadsTests/nq-syntax-uri-04.nq
diff --git a/tests/NQuadsTests/nq-syntax-uri-05.nq b/test/NQuadsTests/nq-syntax-uri-05.nq
index cf5a0ee2..cf5a0ee2 100644
--- a/tests/NQuadsTests/nq-syntax-uri-05.nq
+++ b/test/NQuadsTests/nq-syntax-uri-05.nq
diff --git a/tests/NQuadsTests/nq-syntax-uri-06.nq b/test/NQuadsTests/nq-syntax-uri-06.nq
index 65e77033..65e77033 100644
--- a/tests/NQuadsTests/nq-syntax-uri-06.nq
+++ b/test/NQuadsTests/nq-syntax-uri-06.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-base-01.nq b/test/NQuadsTests/nt-syntax-bad-base-01.nq
index dff1b3b4..dff1b3b4 100644
--- a/tests/NQuadsTests/nt-syntax-bad-base-01.nq
+++ b/test/NQuadsTests/nt-syntax-bad-base-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-esc-01.nq b/test/NQuadsTests/nt-syntax-bad-esc-01.nq
index f7a88add..f7a88add 100644
--- a/tests/NQuadsTests/nt-syntax-bad-esc-01.nq
+++ b/test/NQuadsTests/nt-syntax-bad-esc-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-esc-02.nq b/test/NQuadsTests/nt-syntax-bad-esc-02.nq
index 72711d49..72711d49 100644
--- a/tests/NQuadsTests/nt-syntax-bad-esc-02.nq
+++ b/test/NQuadsTests/nt-syntax-bad-esc-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-esc-03.nq b/test/NQuadsTests/nt-syntax-bad-esc-03.nq
index 3a4522fc..3a4522fc 100644
--- a/tests/NQuadsTests/nt-syntax-bad-esc-03.nq
+++ b/test/NQuadsTests/nt-syntax-bad-esc-03.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-lang-01.nq b/test/NQuadsTests/nt-syntax-bad-lang-01.nq
index a4d952c8..a4d952c8 100644
--- a/tests/NQuadsTests/nt-syntax-bad-lang-01.nq
+++ b/test/NQuadsTests/nt-syntax-bad-lang-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-num-01.nq b/test/NQuadsTests/nt-syntax-bad-num-01.nq
index 2be6f516..2be6f516 100644
--- a/tests/NQuadsTests/nt-syntax-bad-num-01.nq
+++ b/test/NQuadsTests/nt-syntax-bad-num-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-num-02.nq b/test/NQuadsTests/nt-syntax-bad-num-02.nq
index e1d5b06c..e1d5b06c 100644
--- a/tests/NQuadsTests/nt-syntax-bad-num-02.nq
+++ b/test/NQuadsTests/nt-syntax-bad-num-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-num-03.nq b/test/NQuadsTests/nt-syntax-bad-num-03.nq
index a9be82fc..a9be82fc 100644
--- a/tests/NQuadsTests/nt-syntax-bad-num-03.nq
+++ b/test/NQuadsTests/nt-syntax-bad-num-03.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-prefix-01.nq b/test/NQuadsTests/nt-syntax-bad-prefix-01.nq
index 89e08cc7..89e08cc7 100644
--- a/tests/NQuadsTests/nt-syntax-bad-prefix-01.nq
+++ b/test/NQuadsTests/nt-syntax-bad-prefix-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-string-01.nq b/test/NQuadsTests/nt-syntax-bad-string-01.nq
index 988af87a..988af87a 100644
--- a/tests/NQuadsTests/nt-syntax-bad-string-01.nq
+++ b/test/NQuadsTests/nt-syntax-bad-string-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-string-02.nq b/test/NQuadsTests/nt-syntax-bad-string-02.nq
index e1d5b06c..e1d5b06c 100644
--- a/tests/NQuadsTests/nt-syntax-bad-string-02.nq
+++ b/test/NQuadsTests/nt-syntax-bad-string-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-string-03.nq b/test/NQuadsTests/nt-syntax-bad-string-03.nq
index 64d343da..64d343da 100644
--- a/tests/NQuadsTests/nt-syntax-bad-string-03.nq
+++ b/test/NQuadsTests/nt-syntax-bad-string-03.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-string-04.nq b/test/NQuadsTests/nt-syntax-bad-string-04.nq
index af4ff28f..af4ff28f 100644
--- a/tests/NQuadsTests/nt-syntax-bad-string-04.nq
+++ b/test/NQuadsTests/nt-syntax-bad-string-04.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-string-05.nq b/test/NQuadsTests/nt-syntax-bad-string-05.nq
index 75ad4b2b..75ad4b2b 100644
--- a/tests/NQuadsTests/nt-syntax-bad-string-05.nq
+++ b/test/NQuadsTests/nt-syntax-bad-string-05.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-string-06.nq b/test/NQuadsTests/nt-syntax-bad-string-06.nq
index 56dcbc60..56dcbc60 100644
--- a/tests/NQuadsTests/nt-syntax-bad-string-06.nq
+++ b/test/NQuadsTests/nt-syntax-bad-string-06.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-string-07.nq b/test/NQuadsTests/nt-syntax-bad-string-07.nq
index 7f1ee800..7f1ee800 100644
--- a/tests/NQuadsTests/nt-syntax-bad-string-07.nq
+++ b/test/NQuadsTests/nt-syntax-bad-string-07.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-struct-01.nq b/test/NQuadsTests/nt-syntax-bad-struct-01.nq
index d546d564..d546d564 100644
--- a/tests/NQuadsTests/nt-syntax-bad-struct-01.nq
+++ b/test/NQuadsTests/nt-syntax-bad-struct-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-struct-02.nq b/test/NQuadsTests/nt-syntax-bad-struct-02.nq
index 1f388c6e..1f388c6e 100644
--- a/tests/NQuadsTests/nt-syntax-bad-struct-02.nq
+++ b/test/NQuadsTests/nt-syntax-bad-struct-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-uri-01.nq b/test/NQuadsTests/nt-syntax-bad-uri-01.nq
index 0e69dc0c..0e69dc0c 100644
--- a/tests/NQuadsTests/nt-syntax-bad-uri-01.nq
+++ b/test/NQuadsTests/nt-syntax-bad-uri-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-uri-02.nq b/test/NQuadsTests/nt-syntax-bad-uri-02.nq
index 36d91af9..36d91af9 100644
--- a/tests/NQuadsTests/nt-syntax-bad-uri-02.nq
+++ b/test/NQuadsTests/nt-syntax-bad-uri-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-uri-03.nq b/test/NQuadsTests/nt-syntax-bad-uri-03.nq
index f512345f..f512345f 100644
--- a/tests/NQuadsTests/nt-syntax-bad-uri-03.nq
+++ b/test/NQuadsTests/nt-syntax-bad-uri-03.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-uri-04.nq b/test/NQuadsTests/nt-syntax-bad-uri-04.nq
index 5cab062c..5cab062c 100644
--- a/tests/NQuadsTests/nt-syntax-bad-uri-04.nq
+++ b/test/NQuadsTests/nt-syntax-bad-uri-04.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-uri-05.nq b/test/NQuadsTests/nt-syntax-bad-uri-05.nq
index be0a21e0..be0a21e0 100644
--- a/tests/NQuadsTests/nt-syntax-bad-uri-05.nq
+++ b/test/NQuadsTests/nt-syntax-bad-uri-05.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-uri-06.nq b/test/NQuadsTests/nt-syntax-bad-uri-06.nq
index b4e64592..b4e64592 100644
--- a/tests/NQuadsTests/nt-syntax-bad-uri-06.nq
+++ b/test/NQuadsTests/nt-syntax-bad-uri-06.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-uri-07.nq b/test/NQuadsTests/nt-syntax-bad-uri-07.nq
index 74534dde..74534dde 100644
--- a/tests/NQuadsTests/nt-syntax-bad-uri-07.nq
+++ b/test/NQuadsTests/nt-syntax-bad-uri-07.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-uri-08.nq b/test/NQuadsTests/nt-syntax-bad-uri-08.nq
index 41a953d4..41a953d4 100644
--- a/tests/NQuadsTests/nt-syntax-bad-uri-08.nq
+++ b/test/NQuadsTests/nt-syntax-bad-uri-08.nq
diff --git a/tests/NQuadsTests/nt-syntax-bad-uri-09.nq b/test/NQuadsTests/nt-syntax-bad-uri-09.nq
index 58821da8..58821da8 100644
--- a/tests/NQuadsTests/nt-syntax-bad-uri-09.nq
+++ b/test/NQuadsTests/nt-syntax-bad-uri-09.nq
diff --git a/tests/NQuadsTests/nt-syntax-bnode-01.nq b/test/NQuadsTests/nt-syntax-bnode-01.nq
index 5fb0d0f9..5fb0d0f9 100644
--- a/tests/NQuadsTests/nt-syntax-bnode-01.nq
+++ b/test/NQuadsTests/nt-syntax-bnode-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-bnode-02.nq b/test/NQuadsTests/nt-syntax-bnode-02.nq
index 737e81b4..737e81b4 100644
--- a/tests/NQuadsTests/nt-syntax-bnode-02.nq
+++ b/test/NQuadsTests/nt-syntax-bnode-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-bnode-03.nq b/test/NQuadsTests/nt-syntax-bnode-03.nq
index 1a1f1c9f..1a1f1c9f 100644
--- a/tests/NQuadsTests/nt-syntax-bnode-03.nq
+++ b/test/NQuadsTests/nt-syntax-bnode-03.nq
diff --git a/tests/NQuadsTests/nt-syntax-datatypes-01.nq b/test/NQuadsTests/nt-syntax-datatypes-01.nq
index 91263091..91263091 100644
--- a/tests/NQuadsTests/nt-syntax-datatypes-01.nq
+++ b/test/NQuadsTests/nt-syntax-datatypes-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-datatypes-02.nq b/test/NQuadsTests/nt-syntax-datatypes-02.nq
index d49cc27d..d49cc27d 100644
--- a/tests/NQuadsTests/nt-syntax-datatypes-02.nq
+++ b/test/NQuadsTests/nt-syntax-datatypes-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-file-01.nq b/test/NQuadsTests/nt-syntax-file-01.nq
index e69de29b..e69de29b 100644
--- a/tests/NQuadsTests/nt-syntax-file-01.nq
+++ b/test/NQuadsTests/nt-syntax-file-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-file-02.nq b/test/NQuadsTests/nt-syntax-file-02.nq
index e6d327d5..e6d327d5 100644
--- a/tests/NQuadsTests/nt-syntax-file-02.nq
+++ b/test/NQuadsTests/nt-syntax-file-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-file-03.nq b/test/NQuadsTests/nt-syntax-file-03.nq
index a9ca0358..a9ca0358 100644
--- a/tests/NQuadsTests/nt-syntax-file-03.nq
+++ b/test/NQuadsTests/nt-syntax-file-03.nq
diff --git a/tests/NQuadsTests/nt-syntax-str-esc-01.nq b/test/NQuadsTests/nt-syntax-str-esc-01.nq
index 3925f2ec..3925f2ec 100644
--- a/tests/NQuadsTests/nt-syntax-str-esc-01.nq
+++ b/test/NQuadsTests/nt-syntax-str-esc-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-str-esc-02.nq b/test/NQuadsTests/nt-syntax-str-esc-02.nq
index e7d032f0..e7d032f0 100644
--- a/tests/NQuadsTests/nt-syntax-str-esc-02.nq
+++ b/test/NQuadsTests/nt-syntax-str-esc-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-str-esc-03.nq b/test/NQuadsTests/nt-syntax-str-esc-03.nq
index b8588c79..b8588c79 100644
--- a/tests/NQuadsTests/nt-syntax-str-esc-03.nq
+++ b/test/NQuadsTests/nt-syntax-str-esc-03.nq
diff --git a/tests/NQuadsTests/nt-syntax-string-01.nq b/test/NQuadsTests/nt-syntax-string-01.nq
index 5333aefe..5333aefe 100644
--- a/tests/NQuadsTests/nt-syntax-string-01.nq
+++ b/test/NQuadsTests/nt-syntax-string-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-string-02.nq b/test/NQuadsTests/nt-syntax-string-02.nq
index 1ab55a33..1ab55a33 100644
--- a/tests/NQuadsTests/nt-syntax-string-02.nq
+++ b/test/NQuadsTests/nt-syntax-string-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-string-03.nq b/test/NQuadsTests/nt-syntax-string-03.nq
index b34ca0f6..b34ca0f6 100644
--- a/tests/NQuadsTests/nt-syntax-string-03.nq
+++ b/test/NQuadsTests/nt-syntax-string-03.nq
diff --git a/tests/NQuadsTests/nt-syntax-subm-01.nq b/test/NQuadsTests/nt-syntax-subm-01.nq
index 91b49889..91b49889 100644
--- a/tests/NQuadsTests/nt-syntax-subm-01.nq
+++ b/test/NQuadsTests/nt-syntax-subm-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-uri-01.nq b/test/NQuadsTests/nt-syntax-uri-01.nq
index 02e6ba98..02e6ba98 100644
--- a/tests/NQuadsTests/nt-syntax-uri-01.nq
+++ b/test/NQuadsTests/nt-syntax-uri-01.nq
diff --git a/tests/NQuadsTests/nt-syntax-uri-02.nq b/test/NQuadsTests/nt-syntax-uri-02.nq
index 664feea1..664feea1 100644
--- a/tests/NQuadsTests/nt-syntax-uri-02.nq
+++ b/test/NQuadsTests/nt-syntax-uri-02.nq
diff --git a/tests/NQuadsTests/nt-syntax-uri-03.nq b/test/NQuadsTests/nt-syntax-uri-03.nq
index b5aeb26e..b5aeb26e 100644
--- a/tests/NQuadsTests/nt-syntax-uri-03.nq
+++ b/test/NQuadsTests/nt-syntax-uri-03.nq
diff --git a/tests/NQuadsTests/nt-syntax-uri-04.nq b/test/NQuadsTests/nt-syntax-uri-04.nq
index 49bacca7..49bacca7 100644
--- a/tests/NQuadsTests/nt-syntax-uri-04.nq
+++ b/test/NQuadsTests/nt-syntax-uri-04.nq
diff --git a/tests/NTriplesTests/README b/test/NTriplesTests/README
index 12d8bf16..12d8bf16 100644
--- a/tests/NTriplesTests/README
+++ b/test/NTriplesTests/README
diff --git a/tests/NTriplesTests/comment_following_triple.nt b/test/NTriplesTests/comment_following_triple.nt
index 5619459a..5619459a 100644
--- a/tests/NTriplesTests/comment_following_triple.nt
+++ b/test/NTriplesTests/comment_following_triple.nt
diff --git a/tests/NTriplesTests/langtagged_string.nt b/test/NTriplesTests/langtagged_string.nt
index 1bddb04e..1bddb04e 100644
--- a/tests/NTriplesTests/langtagged_string.nt
+++ b/test/NTriplesTests/langtagged_string.nt
diff --git a/tests/NTriplesTests/lantag_with_subtag.nt b/test/NTriplesTests/lantag_with_subtag.nt
index 629cbf42..629cbf42 100644
--- a/tests/NTriplesTests/lantag_with_subtag.nt
+++ b/test/NTriplesTests/lantag_with_subtag.nt
diff --git a/tests/NTriplesTests/literal.nt b/test/NTriplesTests/literal.nt
index 3aba89e4..3aba89e4 100644
--- a/tests/NTriplesTests/literal.nt
+++ b/test/NTriplesTests/literal.nt
diff --git a/tests/NTriplesTests/literal_all_controls.nt b/test/NTriplesTests/literal_all_controls.nt
index 91c8af14..91c8af14 100644
--- a/tests/NTriplesTests/literal_all_controls.nt
+++ b/test/NTriplesTests/literal_all_controls.nt
diff --git a/tests/NTriplesTests/literal_all_punctuation.nt b/test/NTriplesTests/literal_all_punctuation.nt
index c25d818f..c25d818f 100644
--- a/tests/NTriplesTests/literal_all_punctuation.nt
+++ b/test/NTriplesTests/literal_all_punctuation.nt
diff --git a/tests/NTriplesTests/literal_ascii_boundaries.nt b/test/NTriplesTests/literal_ascii_boundaries.nt
index 7a4dc717..7a4dc717 100644
--- a/tests/NTriplesTests/literal_ascii_boundaries.nt
+++ b/test/NTriplesTests/literal_ascii_boundaries.nt
diff --git a/tests/NTriplesTests/literal_false.nt b/test/NTriplesTests/literal_false.nt
index 5bbbae84..5bbbae84 100644
--- a/tests/NTriplesTests/literal_false.nt
+++ b/test/NTriplesTests/literal_false.nt
diff --git a/tests/NTriplesTests/literal_true.nt b/test/NTriplesTests/literal_true.nt
index 054b229f..054b229f 100644
--- a/tests/NTriplesTests/literal_true.nt
+++ b/test/NTriplesTests/literal_true.nt
diff --git a/tests/NTriplesTests/literal_with_2_dquotes.nt b/test/NTriplesTests/literal_with_2_dquotes.nt
index 3e69dc10..3e69dc10 100644
--- a/tests/NTriplesTests/literal_with_2_dquotes.nt
+++ b/test/NTriplesTests/literal_with_2_dquotes.nt
diff --git a/tests/NTriplesTests/literal_with_2_squotes.nt b/test/NTriplesTests/literal_with_2_squotes.nt
index 8ddc52e8..8ddc52e8 100644
--- a/tests/NTriplesTests/literal_with_2_squotes.nt
+++ b/test/NTriplesTests/literal_with_2_squotes.nt
diff --git a/tests/NTriplesTests/literal_with_BACKSPACE.nt b/test/NTriplesTests/literal_with_BACKSPACE.nt
index 339013df..339013df 100644
--- a/tests/NTriplesTests/literal_with_BACKSPACE.nt
+++ b/test/NTriplesTests/literal_with_BACKSPACE.nt
diff --git a/tests/NTriplesTests/literal_with_CARRIAGE_RETURN.nt b/test/NTriplesTests/literal_with_CARRIAGE_RETURN.nt
index 91b85c89..91b85c89 100644
--- a/tests/NTriplesTests/literal_with_CARRIAGE_RETURN.nt
+++ b/test/NTriplesTests/literal_with_CARRIAGE_RETURN.nt
diff --git a/tests/NTriplesTests/literal_with_CHARACTER_TABULATION.nt b/test/NTriplesTests/literal_with_CHARACTER_TABULATION.nt
index a6a9d9f0..a6a9d9f0 100644
--- a/tests/NTriplesTests/literal_with_CHARACTER_TABULATION.nt
+++ b/test/NTriplesTests/literal_with_CHARACTER_TABULATION.nt
diff --git a/tests/NTriplesTests/literal_with_FORM_FEED.nt b/test/NTriplesTests/literal_with_FORM_FEED.nt
index 10d2c6d7..10d2c6d7 100644
--- a/tests/NTriplesTests/literal_with_FORM_FEED.nt
+++ b/test/NTriplesTests/literal_with_FORM_FEED.nt
diff --git a/tests/NTriplesTests/literal_with_LINE_FEED.nt b/test/NTriplesTests/literal_with_LINE_FEED.nt
index 462f97ac..462f97ac 100644
--- a/tests/NTriplesTests/literal_with_LINE_FEED.nt
+++ b/test/NTriplesTests/literal_with_LINE_FEED.nt
diff --git a/tests/NTriplesTests/literal_with_REVERSE_SOLIDUS.nt b/test/NTriplesTests/literal_with_REVERSE_SOLIDUS.nt
index ebc846ed..ebc846ed 100644
--- a/tests/NTriplesTests/literal_with_REVERSE_SOLIDUS.nt
+++ b/test/NTriplesTests/literal_with_REVERSE_SOLIDUS.nt
diff --git a/tests/NTriplesTests/literal_with_REVERSE_SOLIDUS2.nt b/test/NTriplesTests/literal_with_REVERSE_SOLIDUS2.nt
index 586e364d..586e364d 100644
--- a/tests/NTriplesTests/literal_with_REVERSE_SOLIDUS2.nt
+++ b/test/NTriplesTests/literal_with_REVERSE_SOLIDUS2.nt
diff --git a/tests/NTriplesTests/literal_with_UTF8_boundaries.nt b/test/NTriplesTests/literal_with_UTF8_boundaries.nt
index 0e1616db..0e1616db 100644
--- a/tests/NTriplesTests/literal_with_UTF8_boundaries.nt
+++ b/test/NTriplesTests/literal_with_UTF8_boundaries.nt
diff --git a/tests/NTriplesTests/literal_with_dquote.nt b/test/NTriplesTests/literal_with_dquote.nt
index 05a1fd3a..05a1fd3a 100644
--- a/tests/NTriplesTests/literal_with_dquote.nt
+++ b/test/NTriplesTests/literal_with_dquote.nt
diff --git a/tests/NTriplesTests/literal_with_numeric_escape4.nt b/test/NTriplesTests/literal_with_numeric_escape4.nt
index 16f0a036..16f0a036 100644
--- a/tests/NTriplesTests/literal_with_numeric_escape4.nt
+++ b/test/NTriplesTests/literal_with_numeric_escape4.nt
diff --git a/tests/NTriplesTests/literal_with_numeric_escape8.nt b/test/NTriplesTests/literal_with_numeric_escape8.nt
index e909a79d..e909a79d 100644
--- a/tests/NTriplesTests/literal_with_numeric_escape8.nt
+++ b/test/NTriplesTests/literal_with_numeric_escape8.nt
diff --git a/tests/NTriplesTests/literal_with_squote.nt b/test/NTriplesTests/literal_with_squote.nt
index acf7f58f..acf7f58f 100644
--- a/tests/NTriplesTests/literal_with_squote.nt
+++ b/test/NTriplesTests/literal_with_squote.nt
diff --git a/tests/NTriplesTests/manifest.ttl b/test/NTriplesTests/manifest.ttl
index 246561cb..246561cb 100644
--- a/tests/NTriplesTests/manifest.ttl
+++ b/test/NTriplesTests/manifest.ttl
diff --git a/tests/NTriplesTests/minimal_whitespace.nt b/test/NTriplesTests/minimal_whitespace.nt
index e9e3a801..e9e3a801 100644
--- a/tests/NTriplesTests/minimal_whitespace.nt
+++ b/test/NTriplesTests/minimal_whitespace.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-base-01.nt b/test/NTriplesTests/nt-syntax-bad-base-01.nt
index dff1b3b4..dff1b3b4 100644
--- a/tests/NTriplesTests/nt-syntax-bad-base-01.nt
+++ b/test/NTriplesTests/nt-syntax-bad-base-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-esc-01.nt b/test/NTriplesTests/nt-syntax-bad-esc-01.nt
index f7a88add..f7a88add 100644
--- a/tests/NTriplesTests/nt-syntax-bad-esc-01.nt
+++ b/test/NTriplesTests/nt-syntax-bad-esc-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-esc-02.nt b/test/NTriplesTests/nt-syntax-bad-esc-02.nt
index 72711d49..72711d49 100644
--- a/tests/NTriplesTests/nt-syntax-bad-esc-02.nt
+++ b/test/NTriplesTests/nt-syntax-bad-esc-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-esc-03.nt b/test/NTriplesTests/nt-syntax-bad-esc-03.nt
index 3a4522fc..3a4522fc 100644
--- a/tests/NTriplesTests/nt-syntax-bad-esc-03.nt
+++ b/test/NTriplesTests/nt-syntax-bad-esc-03.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-lang-01.nt b/test/NTriplesTests/nt-syntax-bad-lang-01.nt
index a4d952c8..a4d952c8 100644
--- a/tests/NTriplesTests/nt-syntax-bad-lang-01.nt
+++ b/test/NTriplesTests/nt-syntax-bad-lang-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-num-01.nt b/test/NTriplesTests/nt-syntax-bad-num-01.nt
index 2be6f516..2be6f516 100644
--- a/tests/NTriplesTests/nt-syntax-bad-num-01.nt
+++ b/test/NTriplesTests/nt-syntax-bad-num-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-num-02.nt b/test/NTriplesTests/nt-syntax-bad-num-02.nt
index e1d5b06c..e1d5b06c 100644
--- a/tests/NTriplesTests/nt-syntax-bad-num-02.nt
+++ b/test/NTriplesTests/nt-syntax-bad-num-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-num-03.nt b/test/NTriplesTests/nt-syntax-bad-num-03.nt
index a9be82fc..a9be82fc 100644
--- a/tests/NTriplesTests/nt-syntax-bad-num-03.nt
+++ b/test/NTriplesTests/nt-syntax-bad-num-03.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-prefix-01.nt b/test/NTriplesTests/nt-syntax-bad-prefix-01.nt
index 89e08cc7..89e08cc7 100644
--- a/tests/NTriplesTests/nt-syntax-bad-prefix-01.nt
+++ b/test/NTriplesTests/nt-syntax-bad-prefix-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-string-01.nt b/test/NTriplesTests/nt-syntax-bad-string-01.nt
index 988af87a..988af87a 100644
--- a/tests/NTriplesTests/nt-syntax-bad-string-01.nt
+++ b/test/NTriplesTests/nt-syntax-bad-string-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-string-02.nt b/test/NTriplesTests/nt-syntax-bad-string-02.nt
index e1d5b06c..e1d5b06c 100644
--- a/tests/NTriplesTests/nt-syntax-bad-string-02.nt
+++ b/test/NTriplesTests/nt-syntax-bad-string-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-string-03.nt b/test/NTriplesTests/nt-syntax-bad-string-03.nt
index 64d343da..64d343da 100644
--- a/tests/NTriplesTests/nt-syntax-bad-string-03.nt
+++ b/test/NTriplesTests/nt-syntax-bad-string-03.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-string-04.nt b/test/NTriplesTests/nt-syntax-bad-string-04.nt
index af4ff28f..af4ff28f 100644
--- a/tests/NTriplesTests/nt-syntax-bad-string-04.nt
+++ b/test/NTriplesTests/nt-syntax-bad-string-04.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-string-05.nt b/test/NTriplesTests/nt-syntax-bad-string-05.nt
index 75ad4b2b..75ad4b2b 100644
--- a/tests/NTriplesTests/nt-syntax-bad-string-05.nt
+++ b/test/NTriplesTests/nt-syntax-bad-string-05.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-string-06.nt b/test/NTriplesTests/nt-syntax-bad-string-06.nt
index 56dcbc60..56dcbc60 100644
--- a/tests/NTriplesTests/nt-syntax-bad-string-06.nt
+++ b/test/NTriplesTests/nt-syntax-bad-string-06.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-string-07.nt b/test/NTriplesTests/nt-syntax-bad-string-07.nt
index 7f1ee800..7f1ee800 100644
--- a/tests/NTriplesTests/nt-syntax-bad-string-07.nt
+++ b/test/NTriplesTests/nt-syntax-bad-string-07.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-struct-01.nt b/test/NTriplesTests/nt-syntax-bad-struct-01.nt
index d546d564..d546d564 100644
--- a/tests/NTriplesTests/nt-syntax-bad-struct-01.nt
+++ b/test/NTriplesTests/nt-syntax-bad-struct-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-struct-02.nt b/test/NTriplesTests/nt-syntax-bad-struct-02.nt
index 1f388c6e..1f388c6e 100644
--- a/tests/NTriplesTests/nt-syntax-bad-struct-02.nt
+++ b/test/NTriplesTests/nt-syntax-bad-struct-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-uri-01.nt b/test/NTriplesTests/nt-syntax-bad-uri-01.nt
index 0e69dc0c..0e69dc0c 100644
--- a/tests/NTriplesTests/nt-syntax-bad-uri-01.nt
+++ b/test/NTriplesTests/nt-syntax-bad-uri-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-uri-02.nt b/test/NTriplesTests/nt-syntax-bad-uri-02.nt
index 36d91af9..36d91af9 100644
--- a/tests/NTriplesTests/nt-syntax-bad-uri-02.nt
+++ b/test/NTriplesTests/nt-syntax-bad-uri-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-uri-03.nt b/test/NTriplesTests/nt-syntax-bad-uri-03.nt
index f512345f..f512345f 100644
--- a/tests/NTriplesTests/nt-syntax-bad-uri-03.nt
+++ b/test/NTriplesTests/nt-syntax-bad-uri-03.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-uri-04.nt b/test/NTriplesTests/nt-syntax-bad-uri-04.nt
index 5cab062c..5cab062c 100644
--- a/tests/NTriplesTests/nt-syntax-bad-uri-04.nt
+++ b/test/NTriplesTests/nt-syntax-bad-uri-04.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-uri-05.nt b/test/NTriplesTests/nt-syntax-bad-uri-05.nt
index be0a21e0..be0a21e0 100644
--- a/tests/NTriplesTests/nt-syntax-bad-uri-05.nt
+++ b/test/NTriplesTests/nt-syntax-bad-uri-05.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-uri-06.nt b/test/NTriplesTests/nt-syntax-bad-uri-06.nt
index b4e64592..b4e64592 100644
--- a/tests/NTriplesTests/nt-syntax-bad-uri-06.nt
+++ b/test/NTriplesTests/nt-syntax-bad-uri-06.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-uri-07.nt b/test/NTriplesTests/nt-syntax-bad-uri-07.nt
index 74534dde..74534dde 100644
--- a/tests/NTriplesTests/nt-syntax-bad-uri-07.nt
+++ b/test/NTriplesTests/nt-syntax-bad-uri-07.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-uri-08.nt b/test/NTriplesTests/nt-syntax-bad-uri-08.nt
index 41a953d4..41a953d4 100644
--- a/tests/NTriplesTests/nt-syntax-bad-uri-08.nt
+++ b/test/NTriplesTests/nt-syntax-bad-uri-08.nt
diff --git a/tests/NTriplesTests/nt-syntax-bad-uri-09.nt b/test/NTriplesTests/nt-syntax-bad-uri-09.nt
index 58821da8..58821da8 100644
--- a/tests/NTriplesTests/nt-syntax-bad-uri-09.nt
+++ b/test/NTriplesTests/nt-syntax-bad-uri-09.nt
diff --git a/tests/NTriplesTests/nt-syntax-bnode-01.nt b/test/NTriplesTests/nt-syntax-bnode-01.nt
index 5fb0d0f9..5fb0d0f9 100644
--- a/tests/NTriplesTests/nt-syntax-bnode-01.nt
+++ b/test/NTriplesTests/nt-syntax-bnode-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-bnode-02.nt b/test/NTriplesTests/nt-syntax-bnode-02.nt
index 737e81b4..737e81b4 100644
--- a/tests/NTriplesTests/nt-syntax-bnode-02.nt
+++ b/test/NTriplesTests/nt-syntax-bnode-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-bnode-03.nt b/test/NTriplesTests/nt-syntax-bnode-03.nt
index 1a1f1c9f..1a1f1c9f 100644
--- a/tests/NTriplesTests/nt-syntax-bnode-03.nt
+++ b/test/NTriplesTests/nt-syntax-bnode-03.nt
diff --git a/tests/NTriplesTests/nt-syntax-datatypes-01.nt b/test/NTriplesTests/nt-syntax-datatypes-01.nt
index 91263091..91263091 100644
--- a/tests/NTriplesTests/nt-syntax-datatypes-01.nt
+++ b/test/NTriplesTests/nt-syntax-datatypes-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-datatypes-02.nt b/test/NTriplesTests/nt-syntax-datatypes-02.nt
index d49cc27d..d49cc27d 100644
--- a/tests/NTriplesTests/nt-syntax-datatypes-02.nt
+++ b/test/NTriplesTests/nt-syntax-datatypes-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-file-01.nt b/test/NTriplesTests/nt-syntax-file-01.nt
index e69de29b..e69de29b 100644
--- a/tests/NTriplesTests/nt-syntax-file-01.nt
+++ b/test/NTriplesTests/nt-syntax-file-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-file-02.nt b/test/NTriplesTests/nt-syntax-file-02.nt
index e6d327d5..e6d327d5 100644
--- a/tests/NTriplesTests/nt-syntax-file-02.nt
+++ b/test/NTriplesTests/nt-syntax-file-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-file-03.nt b/test/NTriplesTests/nt-syntax-file-03.nt
index a9ca0358..a9ca0358 100644
--- a/tests/NTriplesTests/nt-syntax-file-03.nt
+++ b/test/NTriplesTests/nt-syntax-file-03.nt
diff --git a/tests/NTriplesTests/nt-syntax-str-esc-01.nt b/test/NTriplesTests/nt-syntax-str-esc-01.nt
index 3925f2ec..3925f2ec 100644
--- a/tests/NTriplesTests/nt-syntax-str-esc-01.nt
+++ b/test/NTriplesTests/nt-syntax-str-esc-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-str-esc-02.nt b/test/NTriplesTests/nt-syntax-str-esc-02.nt
index e7d032f0..e7d032f0 100644
--- a/tests/NTriplesTests/nt-syntax-str-esc-02.nt
+++ b/test/NTriplesTests/nt-syntax-str-esc-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-str-esc-03.nt b/test/NTriplesTests/nt-syntax-str-esc-03.nt
index b8588c79..b8588c79 100644
--- a/tests/NTriplesTests/nt-syntax-str-esc-03.nt
+++ b/test/NTriplesTests/nt-syntax-str-esc-03.nt
diff --git a/tests/NTriplesTests/nt-syntax-string-01.nt b/test/NTriplesTests/nt-syntax-string-01.nt
index 5333aefe..5333aefe 100644
--- a/tests/NTriplesTests/nt-syntax-string-01.nt
+++ b/test/NTriplesTests/nt-syntax-string-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-string-02.nt b/test/NTriplesTests/nt-syntax-string-02.nt
index 1ab55a33..1ab55a33 100644
--- a/tests/NTriplesTests/nt-syntax-string-02.nt
+++ b/test/NTriplesTests/nt-syntax-string-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-string-03.nt b/test/NTriplesTests/nt-syntax-string-03.nt
index b34ca0f6..b34ca0f6 100644
--- a/tests/NTriplesTests/nt-syntax-string-03.nt
+++ b/test/NTriplesTests/nt-syntax-string-03.nt
diff --git a/tests/NTriplesTests/nt-syntax-subm-01.nt b/test/NTriplesTests/nt-syntax-subm-01.nt
index 91b49889..91b49889 100644
--- a/tests/NTriplesTests/nt-syntax-subm-01.nt
+++ b/test/NTriplesTests/nt-syntax-subm-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-uri-01.nt b/test/NTriplesTests/nt-syntax-uri-01.nt
index 02e6ba98..02e6ba98 100644
--- a/tests/NTriplesTests/nt-syntax-uri-01.nt
+++ b/test/NTriplesTests/nt-syntax-uri-01.nt
diff --git a/tests/NTriplesTests/nt-syntax-uri-02.nt b/test/NTriplesTests/nt-syntax-uri-02.nt
index 664feea1..664feea1 100644
--- a/tests/NTriplesTests/nt-syntax-uri-02.nt
+++ b/test/NTriplesTests/nt-syntax-uri-02.nt
diff --git a/tests/NTriplesTests/nt-syntax-uri-03.nt b/test/NTriplesTests/nt-syntax-uri-03.nt
index b5aeb26e..b5aeb26e 100644
--- a/tests/NTriplesTests/nt-syntax-uri-03.nt
+++ b/test/NTriplesTests/nt-syntax-uri-03.nt
diff --git a/tests/NTriplesTests/nt-syntax-uri-04.nt b/test/NTriplesTests/nt-syntax-uri-04.nt
index 49bacca7..49bacca7 100644
--- a/tests/NTriplesTests/nt-syntax-uri-04.nt
+++ b/test/NTriplesTests/nt-syntax-uri-04.nt
diff --git a/tests/TriGTests/HYPHEN_MINUS_in_localName.nq b/test/TriGTests/HYPHEN_MINUS_in_localName.nq
index 2de67fd4..2de67fd4 100644
--- a/tests/TriGTests/HYPHEN_MINUS_in_localName.nq
+++ b/test/TriGTests/HYPHEN_MINUS_in_localName.nq
diff --git a/tests/TriGTests/HYPHEN_MINUS_in_localName.trig b/test/TriGTests/HYPHEN_MINUS_in_localName.trig
index e93280e9..e93280e9 100644
--- a/tests/TriGTests/HYPHEN_MINUS_in_localName.trig
+++ b/test/TriGTests/HYPHEN_MINUS_in_localName.trig
diff --git a/tests/TriGTests/IRIREF_datatype.nq b/test/TriGTests/IRIREF_datatype.nq
index 2ddce8e3..2ddce8e3 100644
--- a/tests/TriGTests/IRIREF_datatype.nq
+++ b/test/TriGTests/IRIREF_datatype.nq
diff --git a/tests/TriGTests/IRIREF_datatype.trig b/test/TriGTests/IRIREF_datatype.trig
index f8e89b17..f8e89b17 100644
--- a/tests/TriGTests/IRIREF_datatype.trig
+++ b/test/TriGTests/IRIREF_datatype.trig
diff --git a/tests/TriGTests/IRI_spo.nq b/test/TriGTests/IRI_spo.nq
index 9e8bf24d..9e8bf24d 100644
--- a/tests/TriGTests/IRI_spo.nq
+++ b/test/TriGTests/IRI_spo.nq
diff --git a/tests/TriGTests/IRI_subject.trig b/test/TriGTests/IRI_subject.trig
index 0a258598..0a258598 100644
--- a/tests/TriGTests/IRI_subject.trig
+++ b/test/TriGTests/IRI_subject.trig
diff --git a/tests/TriGTests/IRI_with_all_punctuation.nq b/test/TriGTests/IRI_with_all_punctuation.nq
index ea278b6c..ea278b6c 100644
--- a/tests/TriGTests/IRI_with_all_punctuation.nq
+++ b/test/TriGTests/IRI_with_all_punctuation.nq
diff --git a/tests/TriGTests/IRI_with_all_punctuation.trig b/test/TriGTests/IRI_with_all_punctuation.trig
index 4b602a73..4b602a73 100644
--- a/tests/TriGTests/IRI_with_all_punctuation.trig
+++ b/test/TriGTests/IRI_with_all_punctuation.trig
diff --git a/tests/TriGTests/IRI_with_eight_digit_numeric_escape.trig b/test/TriGTests/IRI_with_eight_digit_numeric_escape.trig
index 6042a770..6042a770 100644
--- a/tests/TriGTests/IRI_with_eight_digit_numeric_escape.trig
+++ b/test/TriGTests/IRI_with_eight_digit_numeric_escape.trig
diff --git a/tests/TriGTests/IRI_with_four_digit_numeric_escape.trig b/test/TriGTests/IRI_with_four_digit_numeric_escape.trig
index 6c659d06..6c659d06 100644
--- a/tests/TriGTests/IRI_with_four_digit_numeric_escape.trig
+++ b/test/TriGTests/IRI_with_four_digit_numeric_escape.trig
diff --git a/tests/TriGTests/LICENSE b/test/TriGTests/LICENSE
index 3c128537..3c128537 100644
--- a/tests/TriGTests/LICENSE
+++ b/test/TriGTests/LICENSE
diff --git a/tests/TriGTests/LITERAL1.nq b/test/TriGTests/LITERAL1.nq
index 97b680a5..97b680a5 100644
--- a/tests/TriGTests/LITERAL1.nq
+++ b/test/TriGTests/LITERAL1.nq
diff --git a/tests/TriGTests/LITERAL1.trig b/test/TriGTests/LITERAL1.trig
index df544ef8..df544ef8 100644
--- a/tests/TriGTests/LITERAL1.trig
+++ b/test/TriGTests/LITERAL1.trig
diff --git a/tests/TriGTests/LITERAL1_all_controls.nq b/test/TriGTests/LITERAL1_all_controls.nq
index 3bfb3bd4..3bfb3bd4 100644
--- a/tests/TriGTests/LITERAL1_all_controls.nq
+++ b/test/TriGTests/LITERAL1_all_controls.nq
diff --git a/tests/TriGTests/LITERAL1_all_controls.trig b/test/TriGTests/LITERAL1_all_controls.trig
index 1246b619..1246b619 100644
--- a/tests/TriGTests/LITERAL1_all_controls.trig
+++ b/test/TriGTests/LITERAL1_all_controls.trig
diff --git a/tests/TriGTests/LITERAL1_all_punctuation.nq b/test/TriGTests/LITERAL1_all_punctuation.nq
index 47ef8763..47ef8763 100644
--- a/tests/TriGTests/LITERAL1_all_punctuation.nq
+++ b/test/TriGTests/LITERAL1_all_punctuation.nq
diff --git a/tests/TriGTests/LITERAL1_all_punctuation.trig b/test/TriGTests/LITERAL1_all_punctuation.trig
index 456e7972..456e7972 100644
--- a/tests/TriGTests/LITERAL1_all_punctuation.trig
+++ b/test/TriGTests/LITERAL1_all_punctuation.trig
diff --git a/tests/TriGTests/LITERAL1_ascii_boundaries.nq b/test/TriGTests/LITERAL1_ascii_boundaries.nq
index 672da9d1..672da9d1 100644
--- a/tests/TriGTests/LITERAL1_ascii_boundaries.nq
+++ b/test/TriGTests/LITERAL1_ascii_boundaries.nq
diff --git a/tests/TriGTests/LITERAL1_ascii_boundaries.trig b/test/TriGTests/LITERAL1_ascii_boundaries.trig
index cd14a4e8..cd14a4e8 100644
--- a/tests/TriGTests/LITERAL1_ascii_boundaries.trig
+++ b/test/TriGTests/LITERAL1_ascii_boundaries.trig
diff --git a/tests/TriGTests/LITERAL1_with_UTF8_boundaries.trig b/test/TriGTests/LITERAL1_with_UTF8_boundaries.trig
index b72eb040..b72eb040 100644
--- a/tests/TriGTests/LITERAL1_with_UTF8_boundaries.trig
+++ b/test/TriGTests/LITERAL1_with_UTF8_boundaries.trig
diff --git a/tests/TriGTests/LITERAL2.trig b/test/TriGTests/LITERAL2.trig
index c2b09ff6..c2b09ff6 100644
--- a/tests/TriGTests/LITERAL2.trig
+++ b/test/TriGTests/LITERAL2.trig
diff --git a/tests/TriGTests/LITERAL2_ascii_boundaries.nq b/test/TriGTests/LITERAL2_ascii_boundaries.nq
index 63402430..63402430 100644
--- a/tests/TriGTests/LITERAL2_ascii_boundaries.nq
+++ b/test/TriGTests/LITERAL2_ascii_boundaries.nq
diff --git a/tests/TriGTests/LITERAL2_ascii_boundaries.trig b/test/TriGTests/LITERAL2_ascii_boundaries.trig
index dd6b3ddf..dd6b3ddf 100644
--- a/tests/TriGTests/LITERAL2_ascii_boundaries.trig
+++ b/test/TriGTests/LITERAL2_ascii_boundaries.trig
diff --git a/tests/TriGTests/LITERAL2_with_UTF8_boundaries.trig b/test/TriGTests/LITERAL2_with_UTF8_boundaries.trig
index 0e1616db..0e1616db 100644
--- a/tests/TriGTests/LITERAL2_with_UTF8_boundaries.trig
+++ b/test/TriGTests/LITERAL2_with_UTF8_boundaries.trig
diff --git a/tests/TriGTests/LITERAL_LONG1.trig b/test/TriGTests/LITERAL_LONG1.trig
index 5db4af44..5db4af44 100644
--- a/tests/TriGTests/LITERAL_LONG1.trig
+++ b/test/TriGTests/LITERAL_LONG1.trig
diff --git a/tests/TriGTests/LITERAL_LONG1_ascii_boundaries.nq b/test/TriGTests/LITERAL_LONG1_ascii_boundaries.nq
index 5dc9b17a..5dc9b17a 100644
--- a/tests/TriGTests/LITERAL_LONG1_ascii_boundaries.nq
+++ b/test/TriGTests/LITERAL_LONG1_ascii_boundaries.nq
diff --git a/tests/TriGTests/LITERAL_LONG1_ascii_boundaries.trig b/test/TriGTests/LITERAL_LONG1_ascii_boundaries.trig
index 25db84dd..25db84dd 100644
--- a/tests/TriGTests/LITERAL_LONG1_ascii_boundaries.trig
+++ b/test/TriGTests/LITERAL_LONG1_ascii_boundaries.trig
diff --git a/tests/TriGTests/LITERAL_LONG1_with_1_squote.nq b/test/TriGTests/LITERAL_LONG1_with_1_squote.nq
index f72af857..f72af857 100644
--- a/tests/TriGTests/LITERAL_LONG1_with_1_squote.nq
+++ b/test/TriGTests/LITERAL_LONG1_with_1_squote.nq
diff --git a/tests/TriGTests/LITERAL_LONG1_with_1_squote.trig b/test/TriGTests/LITERAL_LONG1_with_1_squote.trig
index 45e742ed..45e742ed 100644
--- a/tests/TriGTests/LITERAL_LONG1_with_1_squote.trig
+++ b/test/TriGTests/LITERAL_LONG1_with_1_squote.trig
diff --git a/tests/TriGTests/LITERAL_LONG1_with_2_squotes.nq b/test/TriGTests/LITERAL_LONG1_with_2_squotes.nq
index 5e7a4890..5e7a4890 100644
--- a/tests/TriGTests/LITERAL_LONG1_with_2_squotes.nq
+++ b/test/TriGTests/LITERAL_LONG1_with_2_squotes.nq
diff --git a/tests/TriGTests/LITERAL_LONG1_with_2_squotes.trig b/test/TriGTests/LITERAL_LONG1_with_2_squotes.trig
index 75f94883..75f94883 100644
--- a/tests/TriGTests/LITERAL_LONG1_with_2_squotes.trig
+++ b/test/TriGTests/LITERAL_LONG1_with_2_squotes.trig
diff --git a/tests/TriGTests/LITERAL_LONG1_with_UTF8_boundaries.trig b/test/TriGTests/LITERAL_LONG1_with_UTF8_boundaries.trig
index e04b675e..e04b675e 100644
--- a/tests/TriGTests/LITERAL_LONG1_with_UTF8_boundaries.trig
+++ b/test/TriGTests/LITERAL_LONG1_with_UTF8_boundaries.trig
diff --git a/tests/TriGTests/LITERAL_LONG2.trig b/test/TriGTests/LITERAL_LONG2.trig
index 2f1a86ec..2f1a86ec 100644
--- a/tests/TriGTests/LITERAL_LONG2.trig
+++ b/test/TriGTests/LITERAL_LONG2.trig
diff --git a/tests/TriGTests/LITERAL_LONG2_ascii_boundaries.nq b/test/TriGTests/LITERAL_LONG2_ascii_boundaries.nq
index 1dc45f7c..1dc45f7c 100644
--- a/tests/TriGTests/LITERAL_LONG2_ascii_boundaries.nq
+++ b/test/TriGTests/LITERAL_LONG2_ascii_boundaries.nq
diff --git a/tests/TriGTests/LITERAL_LONG2_ascii_boundaries.trig b/test/TriGTests/LITERAL_LONG2_ascii_boundaries.trig
index 804fe250..804fe250 100644
--- a/tests/TriGTests/LITERAL_LONG2_ascii_boundaries.trig
+++ b/test/TriGTests/LITERAL_LONG2_ascii_boundaries.trig
diff --git a/tests/TriGTests/LITERAL_LONG2_with_1_squote.nq b/test/TriGTests/LITERAL_LONG2_with_1_squote.nq
index 3cbb9785..3cbb9785 100644
--- a/tests/TriGTests/LITERAL_LONG2_with_1_squote.nq
+++ b/test/TriGTests/LITERAL_LONG2_with_1_squote.nq
diff --git a/tests/TriGTests/LITERAL_LONG2_with_1_squote.trig b/test/TriGTests/LITERAL_LONG2_with_1_squote.trig
index fccbe173..fccbe173 100644
--- a/tests/TriGTests/LITERAL_LONG2_with_1_squote.trig
+++ b/test/TriGTests/LITERAL_LONG2_with_1_squote.trig
diff --git a/tests/TriGTests/LITERAL_LONG2_with_2_squotes.nq b/test/TriGTests/LITERAL_LONG2_with_2_squotes.nq
index cdab9945..cdab9945 100644
--- a/tests/TriGTests/LITERAL_LONG2_with_2_squotes.nq
+++ b/test/TriGTests/LITERAL_LONG2_with_2_squotes.nq
diff --git a/tests/TriGTests/LITERAL_LONG2_with_2_squotes.trig b/test/TriGTests/LITERAL_LONG2_with_2_squotes.trig
index 8d1f3359..8d1f3359 100644
--- a/tests/TriGTests/LITERAL_LONG2_with_2_squotes.trig
+++ b/test/TriGTests/LITERAL_LONG2_with_2_squotes.trig
diff --git a/tests/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq b/test/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq
index 43b76993..43b76993 100644
--- a/tests/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq
+++ b/test/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq
diff --git a/tests/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig b/test/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig
index 4dfe5e1f..4dfe5e1f 100644
--- a/tests/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig
+++ b/test/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig
diff --git a/tests/TriGTests/LITERAL_LONG2_with_UTF8_boundaries.trig b/test/TriGTests/LITERAL_LONG2_with_UTF8_boundaries.trig
index 644b32d8..644b32d8 100644
--- a/tests/TriGTests/LITERAL_LONG2_with_UTF8_boundaries.trig
+++ b/test/TriGTests/LITERAL_LONG2_with_UTF8_boundaries.trig
diff --git a/tests/TriGTests/LITERAL_with_UTF8_boundaries.nq b/test/TriGTests/LITERAL_with_UTF8_boundaries.nq
index 47a2527a..47a2527a 100644
--- a/tests/TriGTests/LITERAL_with_UTF8_boundaries.nq
+++ b/test/TriGTests/LITERAL_with_UTF8_boundaries.nq
diff --git a/tests/TriGTests/README b/test/TriGTests/README
index adbb2a3f..adbb2a3f 100644
--- a/tests/TriGTests/README
+++ b/test/TriGTests/README
diff --git a/tests/TriGTests/SPARQL_style_base.trig b/test/TriGTests/SPARQL_style_base.trig
index 5697b450..5697b450 100644
--- a/tests/TriGTests/SPARQL_style_base.trig
+++ b/test/TriGTests/SPARQL_style_base.trig
diff --git a/tests/TriGTests/SPARQL_style_prefix.trig b/test/TriGTests/SPARQL_style_prefix.trig
index 49bc9737..49bc9737 100644
--- a/tests/TriGTests/SPARQL_style_prefix.trig
+++ b/test/TriGTests/SPARQL_style_prefix.trig
diff --git a/tests/TriGTests/alternating_bnode_graphs.nq b/test/TriGTests/alternating_bnode_graphs.nq
index 66124112..66124112 100644
--- a/tests/TriGTests/alternating_bnode_graphs.nq
+++ b/test/TriGTests/alternating_bnode_graphs.nq
diff --git a/tests/TriGTests/alternating_bnode_graphs.trig b/test/TriGTests/alternating_bnode_graphs.trig
index e921099b..e921099b 100644
--- a/tests/TriGTests/alternating_bnode_graphs.trig
+++ b/test/TriGTests/alternating_bnode_graphs.trig
diff --git a/tests/TriGTests/alternating_iri_graphs.nq b/test/TriGTests/alternating_iri_graphs.nq
index 29c063e4..29c063e4 100644
--- a/tests/TriGTests/alternating_iri_graphs.nq
+++ b/test/TriGTests/alternating_iri_graphs.nq
diff --git a/tests/TriGTests/alternating_iri_graphs.trig b/test/TriGTests/alternating_iri_graphs.trig
index 6ce4d656..6ce4d656 100644
--- a/tests/TriGTests/alternating_iri_graphs.trig
+++ b/test/TriGTests/alternating_iri_graphs.trig
diff --git a/tests/TriGTests/anonymous_blank_node_graph.nq b/test/TriGTests/anonymous_blank_node_graph.nq
index 0522cbda..0522cbda 100644
--- a/tests/TriGTests/anonymous_blank_node_graph.nq
+++ b/test/TriGTests/anonymous_blank_node_graph.nq
diff --git a/tests/TriGTests/anonymous_blank_node_graph.trig b/test/TriGTests/anonymous_blank_node_graph.trig
index 6dd8d54e..6dd8d54e 100644
--- a/tests/TriGTests/anonymous_blank_node_graph.trig
+++ b/test/TriGTests/anonymous_blank_node_graph.trig
diff --git a/tests/TriGTests/anonymous_blank_node_object.nq b/test/TriGTests/anonymous_blank_node_object.nq
index a2c997f2..a2c997f2 100644
--- a/tests/TriGTests/anonymous_blank_node_object.nq
+++ b/test/TriGTests/anonymous_blank_node_object.nq
diff --git a/tests/TriGTests/anonymous_blank_node_object.trig b/test/TriGTests/anonymous_blank_node_object.trig
index e91e7102..e91e7102 100644
--- a/tests/TriGTests/anonymous_blank_node_object.trig
+++ b/test/TriGTests/anonymous_blank_node_object.trig
diff --git a/tests/TriGTests/anonymous_blank_node_subject.nq b/test/TriGTests/anonymous_blank_node_subject.nq
index b17e189c..b17e189c 100644
--- a/tests/TriGTests/anonymous_blank_node_subject.nq
+++ b/test/TriGTests/anonymous_blank_node_subject.nq
diff --git a/tests/TriGTests/anonymous_blank_node_subject.trig b/test/TriGTests/anonymous_blank_node_subject.trig
index e9866f94..e9866f94 100644
--- a/tests/TriGTests/anonymous_blank_node_subject.trig
+++ b/test/TriGTests/anonymous_blank_node_subject.trig
diff --git a/tests/TriGTests/bareword_a_predicate.nq b/test/TriGTests/bareword_a_predicate.nq
index fd01c46a..fd01c46a 100644
--- a/tests/TriGTests/bareword_a_predicate.nq
+++ b/test/TriGTests/bareword_a_predicate.nq
diff --git a/tests/TriGTests/bareword_a_predicate.trig b/test/TriGTests/bareword_a_predicate.trig
index 315dc9bb..315dc9bb 100644
--- a/tests/TriGTests/bareword_a_predicate.trig
+++ b/test/TriGTests/bareword_a_predicate.trig
diff --git a/tests/TriGTests/bareword_decimal.nq b/test/TriGTests/bareword_decimal.nq
index ed5de576..ed5de576 100644
--- a/tests/TriGTests/bareword_decimal.nq
+++ b/test/TriGTests/bareword_decimal.nq
diff --git a/tests/TriGTests/bareword_decimal.trig b/test/TriGTests/bareword_decimal.trig
index f862e712..f862e712 100644
--- a/tests/TriGTests/bareword_decimal.trig
+++ b/test/TriGTests/bareword_decimal.trig
diff --git a/tests/TriGTests/bareword_double.nq b/test/TriGTests/bareword_double.nq
index f1783256..f1783256 100644
--- a/tests/TriGTests/bareword_double.nq
+++ b/test/TriGTests/bareword_double.nq
diff --git a/tests/TriGTests/bareword_double.trig b/test/TriGTests/bareword_double.trig
index 788b8cee..788b8cee 100644
--- a/tests/TriGTests/bareword_double.trig
+++ b/test/TriGTests/bareword_double.trig
diff --git a/tests/TriGTests/bareword_integer.trig b/test/TriGTests/bareword_integer.trig
index be1fa8ed..be1fa8ed 100644
--- a/tests/TriGTests/bareword_integer.trig
+++ b/test/TriGTests/bareword_integer.trig
diff --git a/tests/TriGTests/blankNodePropertyList_as_object.nq b/test/TriGTests/blankNodePropertyList_as_object.nq
index 8e38d4e4..8e38d4e4 100644
--- a/tests/TriGTests/blankNodePropertyList_as_object.nq
+++ b/test/TriGTests/blankNodePropertyList_as_object.nq
diff --git a/tests/TriGTests/blankNodePropertyList_as_object.trig b/test/TriGTests/blankNodePropertyList_as_object.trig
index 724d77ba..724d77ba 100644
--- a/tests/TriGTests/blankNodePropertyList_as_object.trig
+++ b/test/TriGTests/blankNodePropertyList_as_object.trig
diff --git a/tests/TriGTests/blankNodePropertyList_as_subject.nq b/test/TriGTests/blankNodePropertyList_as_subject.nq
index b3c274ce..b3c274ce 100644
--- a/tests/TriGTests/blankNodePropertyList_as_subject.nq
+++ b/test/TriGTests/blankNodePropertyList_as_subject.nq
diff --git a/tests/TriGTests/blankNodePropertyList_as_subject.trig b/test/TriGTests/blankNodePropertyList_as_subject.trig
index 925b680a..925b680a 100644
--- a/tests/TriGTests/blankNodePropertyList_as_subject.trig
+++ b/test/TriGTests/blankNodePropertyList_as_subject.trig
diff --git a/tests/TriGTests/blankNodePropertyList_containing_collection.nq b/test/TriGTests/blankNodePropertyList_containing_collection.nq
index 85f272a7..85f272a7 100644
--- a/tests/TriGTests/blankNodePropertyList_containing_collection.nq
+++ b/test/TriGTests/blankNodePropertyList_containing_collection.nq
diff --git a/tests/TriGTests/blankNodePropertyList_containing_collection.trig b/test/TriGTests/blankNodePropertyList_containing_collection.trig
index d23b848c..d23b848c 100644
--- a/tests/TriGTests/blankNodePropertyList_containing_collection.trig
+++ b/test/TriGTests/blankNodePropertyList_containing_collection.trig
diff --git a/tests/TriGTests/blankNodePropertyList_with_multiple_triples.nq b/test/TriGTests/blankNodePropertyList_with_multiple_triples.nq
index ac7e6125..ac7e6125 100644
--- a/tests/TriGTests/blankNodePropertyList_with_multiple_triples.nq
+++ b/test/TriGTests/blankNodePropertyList_with_multiple_triples.nq
diff --git a/tests/TriGTests/blankNodePropertyList_with_multiple_triples.trig b/test/TriGTests/blankNodePropertyList_with_multiple_triples.trig
index dc5b5461..dc5b5461 100644
--- a/tests/TriGTests/blankNodePropertyList_with_multiple_triples.trig
+++ b/test/TriGTests/blankNodePropertyList_with_multiple_triples.trig
diff --git a/tests/TriGTests/collection_object.nq b/test/TriGTests/collection_object.nq
index 8ced4ad1..8ced4ad1 100644
--- a/tests/TriGTests/collection_object.nq
+++ b/test/TriGTests/collection_object.nq
diff --git a/tests/TriGTests/collection_object.trig b/test/TriGTests/collection_object.trig
index a86dd42f..a86dd42f 100644
--- a/tests/TriGTests/collection_object.trig
+++ b/test/TriGTests/collection_object.trig
diff --git a/tests/TriGTests/collection_subject.nq b/test/TriGTests/collection_subject.nq
index 26858dc1..26858dc1 100644
--- a/tests/TriGTests/collection_subject.nq
+++ b/test/TriGTests/collection_subject.nq
diff --git a/tests/TriGTests/collection_subject.trig b/test/TriGTests/collection_subject.trig
index cb49acd8..cb49acd8 100644
--- a/tests/TriGTests/collection_subject.trig
+++ b/test/TriGTests/collection_subject.trig
diff --git a/tests/TriGTests/comment_following_PNAME_NS.nq b/test/TriGTests/comment_following_PNAME_NS.nq
index a8ca81c5..a8ca81c5 100644
--- a/tests/TriGTests/comment_following_PNAME_NS.nq
+++ b/test/TriGTests/comment_following_PNAME_NS.nq
diff --git a/tests/TriGTests/comment_following_PNAME_NS.trig b/test/TriGTests/comment_following_PNAME_NS.trig
index c03124c4..c03124c4 100644
--- a/tests/TriGTests/comment_following_PNAME_NS.trig
+++ b/test/TriGTests/comment_following_PNAME_NS.trig
diff --git a/tests/TriGTests/comment_following_localName.trig b/test/TriGTests/comment_following_localName.trig
index 649a9a59..649a9a59 100644
--- a/tests/TriGTests/comment_following_localName.trig
+++ b/test/TriGTests/comment_following_localName.trig
diff --git a/tests/TriGTests/default_namespace_IRI.trig b/test/TriGTests/default_namespace_IRI.trig
index 7eccc879..7eccc879 100644
--- a/tests/TriGTests/default_namespace_IRI.trig
+++ b/test/TriGTests/default_namespace_IRI.trig
diff --git a/tests/TriGTests/double_lower_case_e.nq b/test/TriGTests/double_lower_case_e.nq
index c19ca11d..c19ca11d 100644
--- a/tests/TriGTests/double_lower_case_e.nq
+++ b/test/TriGTests/double_lower_case_e.nq
diff --git a/tests/TriGTests/double_lower_case_e.trig b/test/TriGTests/double_lower_case_e.trig
index 588669fa..588669fa 100644
--- a/tests/TriGTests/double_lower_case_e.trig
+++ b/test/TriGTests/double_lower_case_e.trig
diff --git a/tests/TriGTests/empty_collection.nq b/test/TriGTests/empty_collection.nq
index f85ed8fb..f85ed8fb 100644
--- a/tests/TriGTests/empty_collection.nq
+++ b/test/TriGTests/empty_collection.nq
diff --git a/tests/TriGTests/empty_collection.trig b/test/TriGTests/empty_collection.trig
index c6aef8b2..c6aef8b2 100644
--- a/tests/TriGTests/empty_collection.trig
+++ b/test/TriGTests/empty_collection.trig
diff --git a/tests/TriGTests/first.nq b/test/TriGTests/first.nq
index 0ba78d55..0ba78d55 100644
--- a/tests/TriGTests/first.nq
+++ b/test/TriGTests/first.nq
diff --git a/tests/TriGTests/first.trig b/test/TriGTests/first.trig
index 0f80aa69..0f80aa69 100644
--- a/tests/TriGTests/first.trig
+++ b/test/TriGTests/first.trig
diff --git a/tests/TriGTests/labeled_blank_node_graph.nq b/test/TriGTests/labeled_blank_node_graph.nq
index e9d83f4e..e9d83f4e 100644
--- a/tests/TriGTests/labeled_blank_node_graph.nq
+++ b/test/TriGTests/labeled_blank_node_graph.nq
diff --git a/tests/TriGTests/labeled_blank_node_graph.trig b/test/TriGTests/labeled_blank_node_graph.trig
index a6adbb98..a6adbb98 100644
--- a/tests/TriGTests/labeled_blank_node_graph.trig
+++ b/test/TriGTests/labeled_blank_node_graph.trig
diff --git a/tests/TriGTests/labeled_blank_node_object.nq b/test/TriGTests/labeled_blank_node_object.nq
index 58b5fad2..58b5fad2 100644
--- a/tests/TriGTests/labeled_blank_node_object.nq
+++ b/test/TriGTests/labeled_blank_node_object.nq
diff --git a/tests/TriGTests/labeled_blank_node_object.trig b/test/TriGTests/labeled_blank_node_object.trig
index 1ac7de76..1ac7de76 100644
--- a/tests/TriGTests/labeled_blank_node_object.trig
+++ b/test/TriGTests/labeled_blank_node_object.trig
diff --git a/tests/TriGTests/labeled_blank_node_subject.nq b/test/TriGTests/labeled_blank_node_subject.nq
index b1f38d51..b1f38d51 100644
--- a/tests/TriGTests/labeled_blank_node_subject.nq
+++ b/test/TriGTests/labeled_blank_node_subject.nq
diff --git a/tests/TriGTests/labeled_blank_node_subject.trig b/test/TriGTests/labeled_blank_node_subject.trig
index 4dca0e98..4dca0e98 100644
--- a/tests/TriGTests/labeled_blank_node_subject.trig
+++ b/test/TriGTests/labeled_blank_node_subject.trig
diff --git a/tests/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nq b/test/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nq
index 969c0c2a..969c0c2a 100644
--- a/tests/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nq
diff --git a/tests/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig b/test/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig
index 8920d476..8920d476 100644
--- a/tests/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig
diff --git a/tests/TriGTests/labeled_blank_node_with_leading_digit.nq b/test/TriGTests/labeled_blank_node_with_leading_digit.nq
index 24f52035..24f52035 100644
--- a/tests/TriGTests/labeled_blank_node_with_leading_digit.nq
+++ b/test/TriGTests/labeled_blank_node_with_leading_digit.nq
diff --git a/tests/TriGTests/labeled_blank_node_with_leading_digit.trig b/test/TriGTests/labeled_blank_node_with_leading_digit.trig
index 32ff3860..32ff3860 100644
--- a/tests/TriGTests/labeled_blank_node_with_leading_digit.trig
+++ b/test/TriGTests/labeled_blank_node_with_leading_digit.trig
diff --git a/tests/TriGTests/labeled_blank_node_with_leading_underscore.nq b/test/TriGTests/labeled_blank_node_with_leading_underscore.nq
index 57d0044e..57d0044e 100644
--- a/tests/TriGTests/labeled_blank_node_with_leading_underscore.nq
+++ b/test/TriGTests/labeled_blank_node_with_leading_underscore.nq
diff --git a/tests/TriGTests/labeled_blank_node_with_leading_underscore.trig b/test/TriGTests/labeled_blank_node_with_leading_underscore.trig
index 11bd621c..11bd621c 100644
--- a/tests/TriGTests/labeled_blank_node_with_leading_underscore.trig
+++ b/test/TriGTests/labeled_blank_node_with_leading_underscore.trig
diff --git a/tests/TriGTests/labeled_blank_node_with_non_leading_extras.nq b/test/TriGTests/labeled_blank_node_with_non_leading_extras.nq
index ebf8024c..ebf8024c 100644
--- a/tests/TriGTests/labeled_blank_node_with_non_leading_extras.nq
+++ b/test/TriGTests/labeled_blank_node_with_non_leading_extras.nq
diff --git a/tests/TriGTests/labeled_blank_node_with_non_leading_extras.trig b/test/TriGTests/labeled_blank_node_with_non_leading_extras.trig
index dad502a4..dad502a4 100644
--- a/tests/TriGTests/labeled_blank_node_with_non_leading_extras.trig
+++ b/test/TriGTests/labeled_blank_node_with_non_leading_extras.trig
diff --git a/tests/TriGTests/langtagged_LONG.trig b/test/TriGTests/langtagged_LONG.trig
index d63e0e19..d63e0e19 100644
--- a/tests/TriGTests/langtagged_LONG.trig
+++ b/test/TriGTests/langtagged_LONG.trig
diff --git a/tests/TriGTests/langtagged_LONG_with_subtag.nq b/test/TriGTests/langtagged_LONG_with_subtag.nq
index 14b56574..14b56574 100644
--- a/tests/TriGTests/langtagged_LONG_with_subtag.nq
+++ b/test/TriGTests/langtagged_LONG_with_subtag.nq
diff --git a/tests/TriGTests/langtagged_LONG_with_subtag.trig b/test/TriGTests/langtagged_LONG_with_subtag.trig
index c7ba8f2d..c7ba8f2d 100644
--- a/tests/TriGTests/langtagged_LONG_with_subtag.trig
+++ b/test/TriGTests/langtagged_LONG_with_subtag.trig
diff --git a/tests/TriGTests/langtagged_non_LONG.nq b/test/TriGTests/langtagged_non_LONG.nq
index 7e0a5b9e..7e0a5b9e 100644
--- a/tests/TriGTests/langtagged_non_LONG.nq
+++ b/test/TriGTests/langtagged_non_LONG.nq
diff --git a/tests/TriGTests/langtagged_non_LONG.trig b/test/TriGTests/langtagged_non_LONG.trig
index bebcb884..bebcb884 100644
--- a/tests/TriGTests/langtagged_non_LONG.trig
+++ b/test/TriGTests/langtagged_non_LONG.trig
diff --git a/tests/TriGTests/lantag_with_subtag.nq b/test/TriGTests/lantag_with_subtag.nq
index 165aa77c..165aa77c 100644
--- a/tests/TriGTests/lantag_with_subtag.nq
+++ b/test/TriGTests/lantag_with_subtag.nq
diff --git a/tests/TriGTests/lantag_with_subtag.trig b/test/TriGTests/lantag_with_subtag.trig
index d25f1039..d25f1039 100644
--- a/tests/TriGTests/lantag_with_subtag.trig
+++ b/test/TriGTests/lantag_with_subtag.trig
diff --git a/tests/TriGTests/last.nq b/test/TriGTests/last.nq
index 54b3d790..54b3d790 100644
--- a/tests/TriGTests/last.nq
+++ b/test/TriGTests/last.nq
diff --git a/tests/TriGTests/last.trig b/test/TriGTests/last.trig
index 6fd17f7f..6fd17f7f 100644
--- a/tests/TriGTests/last.trig
+++ b/test/TriGTests/last.trig
diff --git a/tests/TriGTests/literal_false.nq b/test/TriGTests/literal_false.nq
index 9a334557..9a334557 100644
--- a/tests/TriGTests/literal_false.nq
+++ b/test/TriGTests/literal_false.nq
diff --git a/tests/TriGTests/literal_false.trig b/test/TriGTests/literal_false.trig
index e1f6f447..e1f6f447 100644
--- a/tests/TriGTests/literal_false.trig
+++ b/test/TriGTests/literal_false.trig
diff --git a/tests/TriGTests/literal_true.nq b/test/TriGTests/literal_true.nq
index 39675c3b..39675c3b 100644
--- a/tests/TriGTests/literal_true.nq
+++ b/test/TriGTests/literal_true.nq
diff --git a/tests/TriGTests/literal_true.trig b/test/TriGTests/literal_true.trig
index b49aa1ac..b49aa1ac 100644
--- a/tests/TriGTests/literal_true.trig
+++ b/test/TriGTests/literal_true.trig
diff --git a/tests/TriGTests/literal_with_BACKSPACE.nq b/test/TriGTests/literal_with_BACKSPACE.nq
index e4e9a247..e4e9a247 100644
--- a/tests/TriGTests/literal_with_BACKSPACE.nq
+++ b/test/TriGTests/literal_with_BACKSPACE.nq
diff --git a/tests/TriGTests/literal_with_BACKSPACE.trig b/test/TriGTests/literal_with_BACKSPACE.trig
index 0a3a1cac..0a3a1cac 100644
--- a/tests/TriGTests/literal_with_BACKSPACE.trig
+++ b/test/TriGTests/literal_with_BACKSPACE.trig
diff --git a/tests/TriGTests/literal_with_CARRIAGE_RETURN.nq b/test/TriGTests/literal_with_CARRIAGE_RETURN.nq
index d1ecddce..d1ecddce 100644
--- a/tests/TriGTests/literal_with_CARRIAGE_RETURN.nq
+++ b/test/TriGTests/literal_with_CARRIAGE_RETURN.nq
diff --git a/tests/TriGTests/literal_with_CARRIAGE_RETURN.trig b/test/TriGTests/literal_with_CARRIAGE_RETURN.trig
index 18d6fe84..18d6fe84 100644
--- a/tests/TriGTests/literal_with_CARRIAGE_RETURN.trig
+++ b/test/TriGTests/literal_with_CARRIAGE_RETURN.trig
diff --git a/tests/TriGTests/literal_with_CHARACTER_TABULATION.nq b/test/TriGTests/literal_with_CHARACTER_TABULATION.nq
index 4baf1754..4baf1754 100644
--- a/tests/TriGTests/literal_with_CHARACTER_TABULATION.nq
+++ b/test/TriGTests/literal_with_CHARACTER_TABULATION.nq
diff --git a/tests/TriGTests/literal_with_CHARACTER_TABULATION.trig b/test/TriGTests/literal_with_CHARACTER_TABULATION.trig
index 65b4152a..65b4152a 100644
--- a/tests/TriGTests/literal_with_CHARACTER_TABULATION.trig
+++ b/test/TriGTests/literal_with_CHARACTER_TABULATION.trig
diff --git a/tests/TriGTests/literal_with_FORM_FEED.nq b/test/TriGTests/literal_with_FORM_FEED.nq
index c6157bf3..c6157bf3 100644
--- a/tests/TriGTests/literal_with_FORM_FEED.nq
+++ b/test/TriGTests/literal_with_FORM_FEED.nq
diff --git a/tests/TriGTests/literal_with_FORM_FEED.trig b/test/TriGTests/literal_with_FORM_FEED.trig
index 742f7cac..742f7cac 100644
--- a/tests/TriGTests/literal_with_FORM_FEED.trig
+++ b/test/TriGTests/literal_with_FORM_FEED.trig
diff --git a/tests/TriGTests/literal_with_LINE_FEED.nq b/test/TriGTests/literal_with_LINE_FEED.nq
index facb59ec..facb59ec 100644
--- a/tests/TriGTests/literal_with_LINE_FEED.nq
+++ b/test/TriGTests/literal_with_LINE_FEED.nq
diff --git a/tests/TriGTests/literal_with_LINE_FEED.trig b/test/TriGTests/literal_with_LINE_FEED.trig
index 26c292d9..26c292d9 100644
--- a/tests/TriGTests/literal_with_LINE_FEED.trig
+++ b/test/TriGTests/literal_with_LINE_FEED.trig
diff --git a/tests/TriGTests/literal_with_REVERSE_SOLIDUS.nq b/test/TriGTests/literal_with_REVERSE_SOLIDUS.nq
index 45674069..45674069 100644
--- a/tests/TriGTests/literal_with_REVERSE_SOLIDUS.nq
+++ b/test/TriGTests/literal_with_REVERSE_SOLIDUS.nq
diff --git a/tests/TriGTests/literal_with_REVERSE_SOLIDUS.trig b/test/TriGTests/literal_with_REVERSE_SOLIDUS.trig
index b939dc28..b939dc28 100644
--- a/tests/TriGTests/literal_with_REVERSE_SOLIDUS.trig
+++ b/test/TriGTests/literal_with_REVERSE_SOLIDUS.trig
diff --git a/tests/TriGTests/literal_with_escaped_BACKSPACE.trig b/test/TriGTests/literal_with_escaped_BACKSPACE.trig
index f13d246b..f13d246b 100644
--- a/tests/TriGTests/literal_with_escaped_BACKSPACE.trig
+++ b/test/TriGTests/literal_with_escaped_BACKSPACE.trig
diff --git a/tests/TriGTests/literal_with_escaped_CARRIAGE_RETURN.trig b/test/TriGTests/literal_with_escaped_CARRIAGE_RETURN.trig
index c2ded66d..c2ded66d 100644
--- a/tests/TriGTests/literal_with_escaped_CARRIAGE_RETURN.trig
+++ b/test/TriGTests/literal_with_escaped_CARRIAGE_RETURN.trig
diff --git a/tests/TriGTests/literal_with_escaped_CHARACTER_TABULATION.trig b/test/TriGTests/literal_with_escaped_CHARACTER_TABULATION.trig
index 60dbac21..60dbac21 100644
--- a/tests/TriGTests/literal_with_escaped_CHARACTER_TABULATION.trig
+++ b/test/TriGTests/literal_with_escaped_CHARACTER_TABULATION.trig
diff --git a/tests/TriGTests/literal_with_escaped_FORM_FEED.trig b/test/TriGTests/literal_with_escaped_FORM_FEED.trig
index 63f8dc97..63f8dc97 100644
--- a/tests/TriGTests/literal_with_escaped_FORM_FEED.trig
+++ b/test/TriGTests/literal_with_escaped_FORM_FEED.trig
diff --git a/tests/TriGTests/literal_with_escaped_LINE_FEED.trig b/test/TriGTests/literal_with_escaped_LINE_FEED.trig
index 2c1f89a4..2c1f89a4 100644
--- a/tests/TriGTests/literal_with_escaped_LINE_FEED.trig
+++ b/test/TriGTests/literal_with_escaped_LINE_FEED.trig
diff --git a/tests/TriGTests/literal_with_numeric_escape4.nq b/test/TriGTests/literal_with_numeric_escape4.nq
index 84fce641..84fce641 100644
--- a/tests/TriGTests/literal_with_numeric_escape4.nq
+++ b/test/TriGTests/literal_with_numeric_escape4.nq
diff --git a/tests/TriGTests/literal_with_numeric_escape4.trig b/test/TriGTests/literal_with_numeric_escape4.trig
index 1c868cc9..1c868cc9 100644
--- a/tests/TriGTests/literal_with_numeric_escape4.trig
+++ b/test/TriGTests/literal_with_numeric_escape4.trig
diff --git a/tests/TriGTests/literal_with_numeric_escape8.trig b/test/TriGTests/literal_with_numeric_escape8.trig
index b36ff3ea..b36ff3ea 100644
--- a/tests/TriGTests/literal_with_numeric_escape8.trig
+++ b/test/TriGTests/literal_with_numeric_escape8.trig
diff --git a/tests/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.nq b/test/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.nq
index 1f93580c..1f93580c 100644
--- a/tests/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.nq
diff --git a/tests/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.trig b/test/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.trig
index 08221635..08221635 100644
--- a/tests/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.trig
diff --git a/tests/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq b/test/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq
index c347f934..c347f934 100644
--- a/tests/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq
diff --git a/tests/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig b/test/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig
index c3f36e9e..c3f36e9e 100644
--- a/tests/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig
diff --git a/tests/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq b/test/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq
index 988855ef..988855ef 100644
--- a/tests/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq
diff --git a/tests/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig b/test/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig
index dd48ac12..dd48ac12 100644
--- a/tests/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig
diff --git a/tests/TriGTests/localName_with_leading_digit.nq b/test/TriGTests/localName_with_leading_digit.nq
index 6f05d1ca..6f05d1ca 100644
--- a/tests/TriGTests/localName_with_leading_digit.nq
+++ b/test/TriGTests/localName_with_leading_digit.nq
diff --git a/tests/TriGTests/localName_with_leading_digit.trig b/test/TriGTests/localName_with_leading_digit.trig
index 540aa007..540aa007 100644
--- a/tests/TriGTests/localName_with_leading_digit.trig
+++ b/test/TriGTests/localName_with_leading_digit.trig
diff --git a/tests/TriGTests/localName_with_leading_underscore.nq b/test/TriGTests/localName_with_leading_underscore.nq
index 2cb72818..2cb72818 100644
--- a/tests/TriGTests/localName_with_leading_underscore.nq
+++ b/test/TriGTests/localName_with_leading_underscore.nq
diff --git a/tests/TriGTests/localName_with_leading_underscore.trig b/test/TriGTests/localName_with_leading_underscore.trig
index 72f2e30b..72f2e30b 100644
--- a/tests/TriGTests/localName_with_leading_underscore.trig
+++ b/test/TriGTests/localName_with_leading_underscore.trig
diff --git a/tests/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq b/test/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq
index 9c6a3d4d..9c6a3d4d 100644
--- a/tests/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq
diff --git a/tests/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig b/test/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig
index d998e3d4..d998e3d4 100644
--- a/tests/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig
diff --git a/tests/TriGTests/localName_with_non_leading_extras.nq b/test/TriGTests/localName_with_non_leading_extras.nq
index 40353439..40353439 100644
--- a/tests/TriGTests/localName_with_non_leading_extras.nq
+++ b/test/TriGTests/localName_with_non_leading_extras.nq
diff --git a/tests/TriGTests/localName_with_non_leading_extras.trig b/test/TriGTests/localName_with_non_leading_extras.trig
index bd1c32c8..bd1c32c8 100644
--- a/tests/TriGTests/localName_with_non_leading_extras.trig
+++ b/test/TriGTests/localName_with_non_leading_extras.trig
diff --git a/tests/TriGTests/localname_with_COLON.nq b/test/TriGTests/localname_with_COLON.nq
index 9a1a0d5a..9a1a0d5a 100644
--- a/tests/TriGTests/localname_with_COLON.nq
+++ b/test/TriGTests/localname_with_COLON.nq
diff --git a/tests/TriGTests/localname_with_COLON.trig b/test/TriGTests/localname_with_COLON.trig
index e166d575..e166d575 100644
--- a/tests/TriGTests/localname_with_COLON.trig
+++ b/test/TriGTests/localname_with_COLON.trig
diff --git a/tests/TriGTests/manifest.ttl b/test/TriGTests/manifest.ttl
index 10a4661f..10a4661f 100644
--- a/tests/TriGTests/manifest.ttl
+++ b/test/TriGTests/manifest.ttl
diff --git a/tests/TriGTests/negative_numeric.nq b/test/TriGTests/negative_numeric.nq
index 9c7f8126..9c7f8126 100644
--- a/tests/TriGTests/negative_numeric.nq
+++ b/test/TriGTests/negative_numeric.nq
diff --git a/tests/TriGTests/negative_numeric.trig b/test/TriGTests/negative_numeric.trig
index cbfe85f8..cbfe85f8 100644
--- a/tests/TriGTests/negative_numeric.trig
+++ b/test/TriGTests/negative_numeric.trig
diff --git a/tests/TriGTests/nested_blankNodePropertyLists.nq b/test/TriGTests/nested_blankNodePropertyLists.nq
index 541cd3b9..541cd3b9 100644
--- a/tests/TriGTests/nested_blankNodePropertyLists.nq
+++ b/test/TriGTests/nested_blankNodePropertyLists.nq
diff --git a/tests/TriGTests/nested_blankNodePropertyLists.trig b/test/TriGTests/nested_blankNodePropertyLists.trig
index 5b28195a..5b28195a 100644
--- a/tests/TriGTests/nested_blankNodePropertyLists.trig
+++ b/test/TriGTests/nested_blankNodePropertyLists.trig
diff --git a/tests/TriGTests/nested_collection.nq b/test/TriGTests/nested_collection.nq
index f504b3aa..f504b3aa 100644
--- a/tests/TriGTests/nested_collection.nq
+++ b/test/TriGTests/nested_collection.nq
diff --git a/tests/TriGTests/nested_collection.trig b/test/TriGTests/nested_collection.trig
index 5d4a3017..5d4a3017 100644
--- a/tests/TriGTests/nested_collection.trig
+++ b/test/TriGTests/nested_collection.trig
diff --git a/tests/TriGTests/number_sign_following_PNAME_NS.nq b/test/TriGTests/number_sign_following_PNAME_NS.nq
index 82d9629a..82d9629a 100644
--- a/tests/TriGTests/number_sign_following_PNAME_NS.nq
+++ b/test/TriGTests/number_sign_following_PNAME_NS.nq
diff --git a/tests/TriGTests/number_sign_following_PNAME_NS.trig b/test/TriGTests/number_sign_following_PNAME_NS.trig
index 2003fa4d..2003fa4d 100644
--- a/tests/TriGTests/number_sign_following_PNAME_NS.trig
+++ b/test/TriGTests/number_sign_following_PNAME_NS.trig
diff --git a/tests/TriGTests/number_sign_following_localName.nq b/test/TriGTests/number_sign_following_localName.nq
index 5ae57b8d..5ae57b8d 100644
--- a/tests/TriGTests/number_sign_following_localName.nq
+++ b/test/TriGTests/number_sign_following_localName.nq
diff --git a/tests/TriGTests/number_sign_following_localName.trig b/test/TriGTests/number_sign_following_localName.trig
index a0e39ecd..a0e39ecd 100644
--- a/tests/TriGTests/number_sign_following_localName.trig
+++ b/test/TriGTests/number_sign_following_localName.trig
diff --git a/tests/TriGTests/numeric_with_leading_0.nq b/test/TriGTests/numeric_with_leading_0.nq
index f028e790..f028e790 100644
--- a/tests/TriGTests/numeric_with_leading_0.nq
+++ b/test/TriGTests/numeric_with_leading_0.nq
diff --git a/tests/TriGTests/numeric_with_leading_0.trig b/test/TriGTests/numeric_with_leading_0.trig
index 6da8ad89..6da8ad89 100644
--- a/tests/TriGTests/numeric_with_leading_0.trig
+++ b/test/TriGTests/numeric_with_leading_0.trig
diff --git a/tests/TriGTests/objectList_with_two_objects.nq b/test/TriGTests/objectList_with_two_objects.nq
index 4b4e044b..4b4e044b 100644
--- a/tests/TriGTests/objectList_with_two_objects.nq
+++ b/test/TriGTests/objectList_with_two_objects.nq
diff --git a/tests/TriGTests/objectList_with_two_objects.trig b/test/TriGTests/objectList_with_two_objects.trig
index 6dbe9792..6dbe9792 100644
--- a/tests/TriGTests/objectList_with_two_objects.trig
+++ b/test/TriGTests/objectList_with_two_objects.trig
diff --git a/tests/TriGTests/old_style_base.trig b/test/TriGTests/old_style_base.trig
index d1f5d4a2..d1f5d4a2 100644
--- a/tests/TriGTests/old_style_base.trig
+++ b/test/TriGTests/old_style_base.trig
diff --git a/tests/TriGTests/old_style_prefix.trig b/test/TriGTests/old_style_prefix.trig
index 014c1f0d..014c1f0d 100644
--- a/tests/TriGTests/old_style_prefix.trig
+++ b/test/TriGTests/old_style_prefix.trig
diff --git a/tests/TriGTests/percent_escaped_localName.nq b/test/TriGTests/percent_escaped_localName.nq
index 85273e95..85273e95 100644
--- a/tests/TriGTests/percent_escaped_localName.nq
+++ b/test/TriGTests/percent_escaped_localName.nq
diff --git a/tests/TriGTests/percent_escaped_localName.trig b/test/TriGTests/percent_escaped_localName.trig
index a2b55c90..a2b55c90 100644
--- a/tests/TriGTests/percent_escaped_localName.trig
+++ b/test/TriGTests/percent_escaped_localName.trig
diff --git a/tests/TriGTests/positive_numeric.nq b/test/TriGTests/positive_numeric.nq
index 25337582..25337582 100644
--- a/tests/TriGTests/positive_numeric.nq
+++ b/test/TriGTests/positive_numeric.nq
diff --git a/tests/TriGTests/positive_numeric.trig b/test/TriGTests/positive_numeric.trig
index 5c7a166d..5c7a166d 100644
--- a/tests/TriGTests/positive_numeric.trig
+++ b/test/TriGTests/positive_numeric.trig
diff --git a/tests/TriGTests/predicateObjectList_with_two_objectLists.nq b/test/TriGTests/predicateObjectList_with_two_objectLists.nq
index 0c203403..0c203403 100644
--- a/tests/TriGTests/predicateObjectList_with_two_objectLists.nq
+++ b/test/TriGTests/predicateObjectList_with_two_objectLists.nq
diff --git a/tests/TriGTests/predicateObjectList_with_two_objectLists.trig b/test/TriGTests/predicateObjectList_with_two_objectLists.trig
index 0513be26..0513be26 100644
--- a/tests/TriGTests/predicateObjectList_with_two_objectLists.trig
+++ b/test/TriGTests/predicateObjectList_with_two_objectLists.trig
diff --git a/tests/TriGTests/prefix_only_IRI.trig b/test/TriGTests/prefix_only_IRI.trig
index c0f4d441..c0f4d441 100644
--- a/tests/TriGTests/prefix_only_IRI.trig
+++ b/test/TriGTests/prefix_only_IRI.trig
diff --git a/tests/TriGTests/prefix_reassigned_and_used.nq b/test/TriGTests/prefix_reassigned_and_used.nq
index 5e65c13f..5e65c13f 100644
--- a/tests/TriGTests/prefix_reassigned_and_used.nq
+++ b/test/TriGTests/prefix_reassigned_and_used.nq
diff --git a/tests/TriGTests/prefix_reassigned_and_used.trig b/test/TriGTests/prefix_reassigned_and_used.trig
index 6abd7ea9..6abd7ea9 100644
--- a/tests/TriGTests/prefix_reassigned_and_used.trig
+++ b/test/TriGTests/prefix_reassigned_and_used.trig
diff --git a/tests/TriGTests/prefix_with_PN_CHARS_BASE_character_boundaries.trig b/test/TriGTests/prefix_with_PN_CHARS_BASE_character_boundaries.trig
index 30b7b8ab..30b7b8ab 100644
--- a/tests/TriGTests/prefix_with_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/TriGTests/prefix_with_PN_CHARS_BASE_character_boundaries.trig
diff --git a/tests/TriGTests/prefix_with_non_leading_extras.trig b/test/TriGTests/prefix_with_non_leading_extras.trig
index 64e86f37..64e86f37 100644
--- a/tests/TriGTests/prefix_with_non_leading_extras.trig
+++ b/test/TriGTests/prefix_with_non_leading_extras.trig
diff --git a/tests/TriGTests/prefixed_IRI_object.trig b/test/TriGTests/prefixed_IRI_object.trig
index 2c04b80b..2c04b80b 100644
--- a/tests/TriGTests/prefixed_IRI_object.trig
+++ b/test/TriGTests/prefixed_IRI_object.trig
diff --git a/tests/TriGTests/prefixed_IRI_predicate.trig b/test/TriGTests/prefixed_IRI_predicate.trig
index f41e7a35..f41e7a35 100644
--- a/tests/TriGTests/prefixed_IRI_predicate.trig
+++ b/test/TriGTests/prefixed_IRI_predicate.trig
diff --git a/tests/TriGTests/prefixed_name_datatype.trig b/test/TriGTests/prefixed_name_datatype.trig
index 45d53873..45d53873 100644
--- a/tests/TriGTests/prefixed_name_datatype.trig
+++ b/test/TriGTests/prefixed_name_datatype.trig
diff --git a/tests/TriGTests/repeated_semis_at_end.trig b/test/TriGTests/repeated_semis_at_end.trig
index e4131b94..e4131b94 100644
--- a/tests/TriGTests/repeated_semis_at_end.trig
+++ b/test/TriGTests/repeated_semis_at_end.trig
diff --git a/tests/TriGTests/repeated_semis_not_at_end.nq b/test/TriGTests/repeated_semis_not_at_end.nq
index 81f01397..81f01397 100644
--- a/tests/TriGTests/repeated_semis_not_at_end.nq
+++ b/test/TriGTests/repeated_semis_not_at_end.nq
diff --git a/tests/TriGTests/repeated_semis_not_at_end.trig b/test/TriGTests/repeated_semis_not_at_end.trig
index 270ac985..270ac985 100644
--- a/tests/TriGTests/repeated_semis_not_at_end.trig
+++ b/test/TriGTests/repeated_semis_not_at_end.trig
diff --git a/tests/TriGTests/reserved_escaped_localName.nq b/test/TriGTests/reserved_escaped_localName.nq
index d965ceb0..d965ceb0 100644
--- a/tests/TriGTests/reserved_escaped_localName.nq
+++ b/test/TriGTests/reserved_escaped_localName.nq
diff --git a/tests/TriGTests/reserved_escaped_localName.trig b/test/TriGTests/reserved_escaped_localName.trig
index 991594ad..991594ad 100644
--- a/tests/TriGTests/reserved_escaped_localName.trig
+++ b/test/TriGTests/reserved_escaped_localName.trig
diff --git a/tests/TriGTests/sole_blankNodePropertyList.nq b/test/TriGTests/sole_blankNodePropertyList.nq
index ae23b3de..ae23b3de 100644
--- a/tests/TriGTests/sole_blankNodePropertyList.nq
+++ b/test/TriGTests/sole_blankNodePropertyList.nq
diff --git a/tests/TriGTests/sole_blankNodePropertyList.trig b/test/TriGTests/sole_blankNodePropertyList.trig
index ae3765f5..ae3765f5 100644
--- a/tests/TriGTests/sole_blankNodePropertyList.trig
+++ b/test/TriGTests/sole_blankNodePropertyList.trig
diff --git a/tests/TriGTests/trig-bnodeplist-graph-bad-01.trig b/test/TriGTests/trig-bnodeplist-graph-bad-01.trig
index 2b9a8d36..2b9a8d36 100644
--- a/tests/TriGTests/trig-bnodeplist-graph-bad-01.trig
+++ b/test/TriGTests/trig-bnodeplist-graph-bad-01.trig
diff --git a/tests/TriGTests/trig-collection-graph-bad-01.trig b/test/TriGTests/trig-collection-graph-bad-01.trig
index e8a7eaeb..e8a7eaeb 100644
--- a/tests/TriGTests/trig-collection-graph-bad-01.trig
+++ b/test/TriGTests/trig-collection-graph-bad-01.trig
diff --git a/tests/TriGTests/trig-collection-graph-bad-02.trig b/test/TriGTests/trig-collection-graph-bad-02.trig
index ba90bcfd..ba90bcfd 100644
--- a/tests/TriGTests/trig-collection-graph-bad-02.trig
+++ b/test/TriGTests/trig-collection-graph-bad-02.trig
diff --git a/tests/TriGTests/trig-eval-bad-01.trig b/test/TriGTests/trig-eval-bad-01.trig
index 36f66252..36f66252 100644
--- a/tests/TriGTests/trig-eval-bad-01.trig
+++ b/test/TriGTests/trig-eval-bad-01.trig
diff --git a/tests/TriGTests/trig-eval-bad-02.trig b/test/TriGTests/trig-eval-bad-02.trig
index 2fc1aa3d..2fc1aa3d 100644
--- a/tests/TriGTests/trig-eval-bad-02.trig
+++ b/test/TriGTests/trig-eval-bad-02.trig
diff --git a/tests/TriGTests/trig-eval-bad-03.trig b/test/TriGTests/trig-eval-bad-03.trig
index 4024af55..4024af55 100644
--- a/tests/TriGTests/trig-eval-bad-03.trig
+++ b/test/TriGTests/trig-eval-bad-03.trig
diff --git a/tests/TriGTests/trig-eval-bad-04.trig b/test/TriGTests/trig-eval-bad-04.trig
index b43b6814..b43b6814 100644
--- a/tests/TriGTests/trig-eval-bad-04.trig
+++ b/test/TriGTests/trig-eval-bad-04.trig
diff --git a/tests/TriGTests/trig-eval-struct-01.nq b/test/TriGTests/trig-eval-struct-01.nq
index 6106c139..6106c139 100644
--- a/tests/TriGTests/trig-eval-struct-01.nq
+++ b/test/TriGTests/trig-eval-struct-01.nq
diff --git a/tests/TriGTests/trig-eval-struct-01.trig b/test/TriGTests/trig-eval-struct-01.trig
index c6003461..c6003461 100644
--- a/tests/TriGTests/trig-eval-struct-01.trig
+++ b/test/TriGTests/trig-eval-struct-01.trig
diff --git a/tests/TriGTests/trig-eval-struct-02.nq b/test/TriGTests/trig-eval-struct-02.nq
index a4e416e9..a4e416e9 100644
--- a/tests/TriGTests/trig-eval-struct-02.nq
+++ b/test/TriGTests/trig-eval-struct-02.nq
diff --git a/tests/TriGTests/trig-eval-struct-02.trig b/test/TriGTests/trig-eval-struct-02.trig
index 332af23c..332af23c 100644
--- a/tests/TriGTests/trig-eval-struct-02.trig
+++ b/test/TriGTests/trig-eval-struct-02.trig
diff --git a/tests/TriGTests/trig-graph-bad-01.trig b/test/TriGTests/trig-graph-bad-01.trig
index a247a68c..a247a68c 100644
--- a/tests/TriGTests/trig-graph-bad-01.trig
+++ b/test/TriGTests/trig-graph-bad-01.trig
diff --git a/tests/TriGTests/trig-graph-bad-02.trig b/test/TriGTests/trig-graph-bad-02.trig
index 47bbda62..47bbda62 100644
--- a/tests/TriGTests/trig-graph-bad-02.trig
+++ b/test/TriGTests/trig-graph-bad-02.trig
diff --git a/tests/TriGTests/trig-graph-bad-03.trig b/test/TriGTests/trig-graph-bad-03.trig
index 31af19f8..31af19f8 100644
--- a/tests/TriGTests/trig-graph-bad-03.trig
+++ b/test/TriGTests/trig-graph-bad-03.trig
diff --git a/tests/TriGTests/trig-graph-bad-04.trig b/test/TriGTests/trig-graph-bad-04.trig
index 23e23a21..23e23a21 100644
--- a/tests/TriGTests/trig-graph-bad-04.trig
+++ b/test/TriGTests/trig-graph-bad-04.trig
diff --git a/tests/TriGTests/trig-graph-bad-05.trig b/test/TriGTests/trig-graph-bad-05.trig
index 7bf470a6..7bf470a6 100644
--- a/tests/TriGTests/trig-graph-bad-05.trig
+++ b/test/TriGTests/trig-graph-bad-05.trig
diff --git a/tests/TriGTests/trig-graph-bad-06.trig b/test/TriGTests/trig-graph-bad-06.trig
index 487ae9e0..487ae9e0 100644
--- a/tests/TriGTests/trig-graph-bad-06.trig
+++ b/test/TriGTests/trig-graph-bad-06.trig
diff --git a/tests/TriGTests/trig-graph-bad-07.trig b/test/TriGTests/trig-graph-bad-07.trig
index de618384..de618384 100644
--- a/tests/TriGTests/trig-graph-bad-07.trig
+++ b/test/TriGTests/trig-graph-bad-07.trig
diff --git a/tests/TriGTests/trig-graph-bad-08.trig b/test/TriGTests/trig-graph-bad-08.trig
index 190d2c0f..190d2c0f 100644
--- a/tests/TriGTests/trig-graph-bad-08.trig
+++ b/test/TriGTests/trig-graph-bad-08.trig
diff --git a/tests/TriGTests/trig-graph-bad-09.trig b/test/TriGTests/trig-graph-bad-09.trig
index 3cfca535..3cfca535 100644
--- a/tests/TriGTests/trig-graph-bad-09.trig
+++ b/test/TriGTests/trig-graph-bad-09.trig
diff --git a/tests/TriGTests/trig-graph-bad-10.trig b/test/TriGTests/trig-graph-bad-10.trig
index fc0531f8..fc0531f8 100644
--- a/tests/TriGTests/trig-graph-bad-10.trig
+++ b/test/TriGTests/trig-graph-bad-10.trig
diff --git a/tests/TriGTests/trig-graph-bad-11.trig b/test/TriGTests/trig-graph-bad-11.trig
index c7b0ffd5..c7b0ffd5 100644
--- a/tests/TriGTests/trig-graph-bad-11.trig
+++ b/test/TriGTests/trig-graph-bad-11.trig
diff --git a/tests/TriGTests/trig-kw-graph-01.trig b/test/TriGTests/trig-kw-graph-01.trig
index acf739bf..acf739bf 100644
--- a/tests/TriGTests/trig-kw-graph-01.trig
+++ b/test/TriGTests/trig-kw-graph-01.trig
diff --git a/tests/TriGTests/trig-kw-graph-02.trig b/test/TriGTests/trig-kw-graph-02.trig
index 6b4f904b..6b4f904b 100644
--- a/tests/TriGTests/trig-kw-graph-02.trig
+++ b/test/TriGTests/trig-kw-graph-02.trig
diff --git a/tests/TriGTests/trig-kw-graph-03.trig b/test/TriGTests/trig-kw-graph-03.trig
index cfb67fe9..cfb67fe9 100644
--- a/tests/TriGTests/trig-kw-graph-03.trig
+++ b/test/TriGTests/trig-kw-graph-03.trig
diff --git a/tests/TriGTests/trig-kw-graph-04.trig b/test/TriGTests/trig-kw-graph-04.trig
index 8a38e30e..8a38e30e 100644
--- a/tests/TriGTests/trig-kw-graph-04.trig
+++ b/test/TriGTests/trig-kw-graph-04.trig
diff --git a/tests/TriGTests/trig-kw-graph-05.trig b/test/TriGTests/trig-kw-graph-05.trig
index acf739bf..acf739bf 100644
--- a/tests/TriGTests/trig-kw-graph-05.trig
+++ b/test/TriGTests/trig-kw-graph-05.trig
diff --git a/tests/TriGTests/trig-kw-graph-06.trig b/test/TriGTests/trig-kw-graph-06.trig
index 9c5ca1a6..9c5ca1a6 100644
--- a/tests/TriGTests/trig-kw-graph-06.trig
+++ b/test/TriGTests/trig-kw-graph-06.trig
diff --git a/tests/TriGTests/trig-kw-graph-07.trig b/test/TriGTests/trig-kw-graph-07.trig
index 3cd8aeb7..3cd8aeb7 100644
--- a/tests/TriGTests/trig-kw-graph-07.trig
+++ b/test/TriGTests/trig-kw-graph-07.trig
diff --git a/tests/TriGTests/trig-kw-graph-08.trig b/test/TriGTests/trig-kw-graph-08.trig
index acf739bf..acf739bf 100644
--- a/tests/TriGTests/trig-kw-graph-08.trig
+++ b/test/TriGTests/trig-kw-graph-08.trig
diff --git a/tests/TriGTests/trig-kw-graph-09.trig b/test/TriGTests/trig-kw-graph-09.trig
index acf739bf..acf739bf 100644
--- a/tests/TriGTests/trig-kw-graph-09.trig
+++ b/test/TriGTests/trig-kw-graph-09.trig
diff --git a/tests/TriGTests/trig-kw-graph-10.trig b/test/TriGTests/trig-kw-graph-10.trig
index cfb67fe9..cfb67fe9 100644
--- a/tests/TriGTests/trig-kw-graph-10.trig
+++ b/test/TriGTests/trig-kw-graph-10.trig
diff --git a/tests/TriGTests/trig-subm-01.nq b/test/TriGTests/trig-subm-01.nq
index 16f21cb9..16f21cb9 100644
--- a/tests/TriGTests/trig-subm-01.nq
+++ b/test/TriGTests/trig-subm-01.nq
diff --git a/tests/TriGTests/trig-subm-01.trig b/test/TriGTests/trig-subm-01.trig
index 9a89c660..9a89c660 100644
--- a/tests/TriGTests/trig-subm-01.trig
+++ b/test/TriGTests/trig-subm-01.trig
diff --git a/tests/TriGTests/trig-subm-02.nq b/test/TriGTests/trig-subm-02.nq
index 299f1cd6..299f1cd6 100644
--- a/tests/TriGTests/trig-subm-02.nq
+++ b/test/TriGTests/trig-subm-02.nq
diff --git a/tests/TriGTests/trig-subm-02.trig b/test/TriGTests/trig-subm-02.trig
index c94a8039..c94a8039 100644
--- a/tests/TriGTests/trig-subm-02.trig
+++ b/test/TriGTests/trig-subm-02.trig
diff --git a/tests/TriGTests/trig-subm-03.nq b/test/TriGTests/trig-subm-03.nq
index aeb54197..aeb54197 100644
--- a/tests/TriGTests/trig-subm-03.nq
+++ b/test/TriGTests/trig-subm-03.nq
diff --git a/tests/TriGTests/trig-subm-03.trig b/test/TriGTests/trig-subm-03.trig
index b52f7c9a..b52f7c9a 100644
--- a/tests/TriGTests/trig-subm-03.trig
+++ b/test/TriGTests/trig-subm-03.trig
diff --git a/tests/TriGTests/trig-subm-04.nq b/test/TriGTests/trig-subm-04.nq
index acf2a1dd..acf2a1dd 100644
--- a/tests/TriGTests/trig-subm-04.nq
+++ b/test/TriGTests/trig-subm-04.nq
diff --git a/tests/TriGTests/trig-subm-04.trig b/test/TriGTests/trig-subm-04.trig
index 2f57b30b..2f57b30b 100644
--- a/tests/TriGTests/trig-subm-04.trig
+++ b/test/TriGTests/trig-subm-04.trig
diff --git a/tests/TriGTests/trig-subm-05.nq b/test/TriGTests/trig-subm-05.nq
index cf4eb939..cf4eb939 100644
--- a/tests/TriGTests/trig-subm-05.nq
+++ b/test/TriGTests/trig-subm-05.nq
diff --git a/tests/TriGTests/trig-subm-05.trig b/test/TriGTests/trig-subm-05.trig
index 8c202b99..8c202b99 100644
--- a/tests/TriGTests/trig-subm-05.trig
+++ b/test/TriGTests/trig-subm-05.trig
diff --git a/tests/TriGTests/trig-subm-06.nq b/test/TriGTests/trig-subm-06.nq
index 4ede34b6..4ede34b6 100644
--- a/tests/TriGTests/trig-subm-06.nq
+++ b/test/TriGTests/trig-subm-06.nq
diff --git a/tests/TriGTests/trig-subm-06.trig b/test/TriGTests/trig-subm-06.trig
index 280c48d5..280c48d5 100644
--- a/tests/TriGTests/trig-subm-06.trig
+++ b/test/TriGTests/trig-subm-06.trig
diff --git a/tests/TriGTests/trig-subm-07.nq b/test/TriGTests/trig-subm-07.nq
index 7c96d3ba..7c96d3ba 100644
--- a/tests/TriGTests/trig-subm-07.nq
+++ b/test/TriGTests/trig-subm-07.nq
diff --git a/tests/TriGTests/trig-subm-07.trig b/test/TriGTests/trig-subm-07.trig
index b5e254af..b5e254af 100644
--- a/tests/TriGTests/trig-subm-07.trig
+++ b/test/TriGTests/trig-subm-07.trig
diff --git a/tests/TriGTests/trig-subm-08.nq b/test/TriGTests/trig-subm-08.nq
index fbb430bd..fbb430bd 100644
--- a/tests/TriGTests/trig-subm-08.nq
+++ b/test/TriGTests/trig-subm-08.nq
diff --git a/tests/TriGTests/trig-subm-08.trig b/test/TriGTests/trig-subm-08.trig
index 7e88c18c..7e88c18c 100644
--- a/tests/TriGTests/trig-subm-08.trig
+++ b/test/TriGTests/trig-subm-08.trig
diff --git a/tests/TriGTests/trig-subm-09.nq b/test/TriGTests/trig-subm-09.nq
index 7c2c83b8..7c2c83b8 100644
--- a/tests/TriGTests/trig-subm-09.nq
+++ b/test/TriGTests/trig-subm-09.nq
diff --git a/tests/TriGTests/trig-subm-09.trig b/test/TriGTests/trig-subm-09.trig
index 7cbd40a8..7cbd40a8 100644
--- a/tests/TriGTests/trig-subm-09.trig
+++ b/test/TriGTests/trig-subm-09.trig
diff --git a/tests/TriGTests/trig-subm-10.nq b/test/TriGTests/trig-subm-10.nq
index 3a84a4c6..3a84a4c6 100644
--- a/tests/TriGTests/trig-subm-10.nq
+++ b/test/TriGTests/trig-subm-10.nq
diff --git a/tests/TriGTests/trig-subm-10.trig b/test/TriGTests/trig-subm-10.trig
index 23bd02de..23bd02de 100644
--- a/tests/TriGTests/trig-subm-10.trig
+++ b/test/TriGTests/trig-subm-10.trig
diff --git a/tests/TriGTests/trig-subm-11.nq b/test/TriGTests/trig-subm-11.nq
index 76147a3a..76147a3a 100644
--- a/tests/TriGTests/trig-subm-11.nq
+++ b/test/TriGTests/trig-subm-11.nq
diff --git a/tests/TriGTests/trig-subm-11.trig b/test/TriGTests/trig-subm-11.trig
index bb1c4991..bb1c4991 100644
--- a/tests/TriGTests/trig-subm-11.trig
+++ b/test/TriGTests/trig-subm-11.trig
diff --git a/tests/TriGTests/trig-subm-12.nq b/test/TriGTests/trig-subm-12.nq
index 32b15c50..32b15c50 100644
--- a/tests/TriGTests/trig-subm-12.nq
+++ b/test/TriGTests/trig-subm-12.nq
diff --git a/tests/TriGTests/trig-subm-12.trig b/test/TriGTests/trig-subm-12.trig
index b0f8ff83..b0f8ff83 100644
--- a/tests/TriGTests/trig-subm-12.trig
+++ b/test/TriGTests/trig-subm-12.trig
diff --git a/tests/TriGTests/trig-subm-13.nq b/test/TriGTests/trig-subm-13.nq
index 84c2a2e5..84c2a2e5 100644
--- a/tests/TriGTests/trig-subm-13.nq
+++ b/test/TriGTests/trig-subm-13.nq
diff --git a/tests/TriGTests/trig-subm-13.trig b/test/TriGTests/trig-subm-13.trig
index 8d1b44da..8d1b44da 100644
--- a/tests/TriGTests/trig-subm-13.trig
+++ b/test/TriGTests/trig-subm-13.trig
diff --git a/tests/TriGTests/trig-subm-14.nq b/test/TriGTests/trig-subm-14.nq
index 89f5b292..89f5b292 100644
--- a/tests/TriGTests/trig-subm-14.nq
+++ b/test/TriGTests/trig-subm-14.nq
diff --git a/tests/TriGTests/trig-subm-14.trig b/test/TriGTests/trig-subm-14.trig
index c70300e1..c70300e1 100644
--- a/tests/TriGTests/trig-subm-14.trig
+++ b/test/TriGTests/trig-subm-14.trig
diff --git a/tests/TriGTests/trig-subm-15.nq b/test/TriGTests/trig-subm-15.nq
index 8d01c44f..8d01c44f 100644
--- a/tests/TriGTests/trig-subm-15.nq
+++ b/test/TriGTests/trig-subm-15.nq
diff --git a/tests/TriGTests/trig-subm-15.trig b/test/TriGTests/trig-subm-15.trig
index 93fbc41a..93fbc41a 100644
--- a/tests/TriGTests/trig-subm-15.trig
+++ b/test/TriGTests/trig-subm-15.trig
diff --git a/tests/TriGTests/trig-subm-16.nq b/test/TriGTests/trig-subm-16.nq
index 2e5fac4e..2e5fac4e 100644
--- a/tests/TriGTests/trig-subm-16.nq
+++ b/test/TriGTests/trig-subm-16.nq
diff --git a/tests/TriGTests/trig-subm-16.trig b/test/TriGTests/trig-subm-16.trig
index 86cb22d5..86cb22d5 100644
--- a/tests/TriGTests/trig-subm-16.trig
+++ b/test/TriGTests/trig-subm-16.trig
diff --git a/tests/TriGTests/trig-subm-17.nq b/test/TriGTests/trig-subm-17.nq
index 7c5d273f..7c5d273f 100644
--- a/tests/TriGTests/trig-subm-17.nq
+++ b/test/TriGTests/trig-subm-17.nq
diff --git a/tests/TriGTests/trig-subm-17.trig b/test/TriGTests/trig-subm-17.trig
index 345ca231..345ca231 100644
--- a/tests/TriGTests/trig-subm-17.trig
+++ b/test/TriGTests/trig-subm-17.trig
diff --git a/tests/TriGTests/trig-subm-18.nq b/test/TriGTests/trig-subm-18.nq
index 58b0a4c4..58b0a4c4 100644
--- a/tests/TriGTests/trig-subm-18.nq
+++ b/test/TriGTests/trig-subm-18.nq
diff --git a/tests/TriGTests/trig-subm-18.trig b/test/TriGTests/trig-subm-18.trig
index f5b4a516..f5b4a516 100644
--- a/tests/TriGTests/trig-subm-18.trig
+++ b/test/TriGTests/trig-subm-18.trig
diff --git a/tests/TriGTests/trig-subm-19.nq b/test/TriGTests/trig-subm-19.nq
index b3cf8075..b3cf8075 100644
--- a/tests/TriGTests/trig-subm-19.nq
+++ b/test/TriGTests/trig-subm-19.nq
diff --git a/tests/TriGTests/trig-subm-19.trig b/test/TriGTests/trig-subm-19.trig
index 7cd14eee..7cd14eee 100644
--- a/tests/TriGTests/trig-subm-19.trig
+++ b/test/TriGTests/trig-subm-19.trig
diff --git a/tests/TriGTests/trig-subm-20.nq b/test/TriGTests/trig-subm-20.nq
index 46f48c74..46f48c74 100644
--- a/tests/TriGTests/trig-subm-20.nq
+++ b/test/TriGTests/trig-subm-20.nq
diff --git a/tests/TriGTests/trig-subm-20.trig b/test/TriGTests/trig-subm-20.trig
index 6e3032e5..6e3032e5 100644
--- a/tests/TriGTests/trig-subm-20.trig
+++ b/test/TriGTests/trig-subm-20.trig
diff --git a/tests/TriGTests/trig-subm-21.nq b/test/TriGTests/trig-subm-21.nq
index 90aec6da..90aec6da 100644
--- a/tests/TriGTests/trig-subm-21.nq
+++ b/test/TriGTests/trig-subm-21.nq
diff --git a/tests/TriGTests/trig-subm-21.trig b/test/TriGTests/trig-subm-21.trig
index 05870fbd..05870fbd 100644
--- a/tests/TriGTests/trig-subm-21.trig
+++ b/test/TriGTests/trig-subm-21.trig
diff --git a/tests/TriGTests/trig-subm-22.nq b/test/TriGTests/trig-subm-22.nq
index 01ab3571..01ab3571 100644
--- a/tests/TriGTests/trig-subm-22.nq
+++ b/test/TriGTests/trig-subm-22.nq
diff --git a/tests/TriGTests/trig-subm-22.trig b/test/TriGTests/trig-subm-22.trig
index 2b546609..2b546609 100644
--- a/tests/TriGTests/trig-subm-22.trig
+++ b/test/TriGTests/trig-subm-22.trig
diff --git a/tests/TriGTests/trig-subm-23.nq b/test/TriGTests/trig-subm-23.nq
index 11328c97..11328c97 100644
--- a/tests/TriGTests/trig-subm-23.nq
+++ b/test/TriGTests/trig-subm-23.nq
diff --git a/tests/TriGTests/trig-subm-23.trig b/test/TriGTests/trig-subm-23.trig
index 3cb24f50..3cb24f50 100644
--- a/tests/TriGTests/trig-subm-23.trig
+++ b/test/TriGTests/trig-subm-23.trig
diff --git a/tests/TriGTests/trig-subm-24.nq b/test/TriGTests/trig-subm-24.nq
index 9de4a324..9de4a324 100644
--- a/tests/TriGTests/trig-subm-24.nq
+++ b/test/TriGTests/trig-subm-24.nq
diff --git a/tests/TriGTests/trig-subm-24.trig b/test/TriGTests/trig-subm-24.trig
index 22ae97ca..22ae97ca 100644
--- a/tests/TriGTests/trig-subm-24.trig
+++ b/test/TriGTests/trig-subm-24.trig
diff --git a/tests/TriGTests/trig-subm-25.nq b/test/TriGTests/trig-subm-25.nq
index bcb4647a..bcb4647a 100644
--- a/tests/TriGTests/trig-subm-25.nq
+++ b/test/TriGTests/trig-subm-25.nq
diff --git a/tests/TriGTests/trig-subm-25.trig b/test/TriGTests/trig-subm-25.trig
index 7c3b9f2a..7c3b9f2a 100644
--- a/tests/TriGTests/trig-subm-25.trig
+++ b/test/TriGTests/trig-subm-25.trig
diff --git a/tests/TriGTests/trig-subm-26.nq b/test/TriGTests/trig-subm-26.nq
index 7357dd40..7357dd40 100644
--- a/tests/TriGTests/trig-subm-26.nq
+++ b/test/TriGTests/trig-subm-26.nq
diff --git a/tests/TriGTests/trig-subm-26.trig b/test/TriGTests/trig-subm-26.trig
index c590800f..c590800f 100644
--- a/tests/TriGTests/trig-subm-26.trig
+++ b/test/TriGTests/trig-subm-26.trig
diff --git a/tests/TriGTests/trig-subm-27.nq b/test/TriGTests/trig-subm-27.nq
index 95e9abbc..95e9abbc 100644
--- a/tests/TriGTests/trig-subm-27.nq
+++ b/test/TriGTests/trig-subm-27.nq
diff --git a/tests/TriGTests/trig-subm-27.trig b/test/TriGTests/trig-subm-27.trig
index 4bb98b8f..4bb98b8f 100644
--- a/tests/TriGTests/trig-subm-27.trig
+++ b/test/TriGTests/trig-subm-27.trig
diff --git a/tests/TriGTests/trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig b/test/TriGTests/trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig
index 7748dd1e..7748dd1e 100644
--- a/tests/TriGTests/trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig
+++ b/test/TriGTests/trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig
diff --git a/tests/TriGTests/trig-syntax-bad-base-01.trig b/test/TriGTests/trig-syntax-bad-base-01.trig
index 7b0412f8..7b0412f8 100644
--- a/tests/TriGTests/trig-syntax-bad-base-01.trig
+++ b/test/TriGTests/trig-syntax-bad-base-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-base-02.trig b/test/TriGTests/trig-syntax-bad-base-02.trig
index 1b2e4845..1b2e4845 100644
--- a/tests/TriGTests/trig-syntax-bad-base-02.trig
+++ b/test/TriGTests/trig-syntax-bad-base-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-base-03.trig b/test/TriGTests/trig-syntax-bad-base-03.trig
index b8f587fa..b8f587fa 100644
--- a/tests/TriGTests/trig-syntax-bad-base-03.trig
+++ b/test/TriGTests/trig-syntax-bad-base-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-base-04.trig b/test/TriGTests/trig-syntax-bad-base-04.trig
index 83c5789b..83c5789b 100644
--- a/tests/TriGTests/trig-syntax-bad-base-04.trig
+++ b/test/TriGTests/trig-syntax-bad-base-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-base-05.trig b/test/TriGTests/trig-syntax-bad-base-05.trig
index fa915d53..fa915d53 100644
--- a/tests/TriGTests/trig-syntax-bad-base-05.trig
+++ b/test/TriGTests/trig-syntax-bad-base-05.trig
diff --git a/tests/TriGTests/trig-syntax-bad-blank-label-dot-end.trig b/test/TriGTests/trig-syntax-bad-blank-label-dot-end.trig
index 33d5edf2..33d5edf2 100644
--- a/tests/TriGTests/trig-syntax-bad-blank-label-dot-end.trig
+++ b/test/TriGTests/trig-syntax-bad-blank-label-dot-end.trig
diff --git a/tests/TriGTests/trig-syntax-bad-esc-01.trig b/test/TriGTests/trig-syntax-bad-esc-01.trig
index abe7fde0..abe7fde0 100644
--- a/tests/TriGTests/trig-syntax-bad-esc-01.trig
+++ b/test/TriGTests/trig-syntax-bad-esc-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-esc-02.trig b/test/TriGTests/trig-syntax-bad-esc-02.trig
index 80f18c81..80f18c81 100644
--- a/tests/TriGTests/trig-syntax-bad-esc-02.trig
+++ b/test/TriGTests/trig-syntax-bad-esc-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-esc-03.trig b/test/TriGTests/trig-syntax-bad-esc-03.trig
index b45f7044..b45f7044 100644
--- a/tests/TriGTests/trig-syntax-bad-esc-03.trig
+++ b/test/TriGTests/trig-syntax-bad-esc-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-esc-04.trig b/test/TriGTests/trig-syntax-bad-esc-04.trig
index b45f7044..b45f7044 100644
--- a/tests/TriGTests/trig-syntax-bad-esc-04.trig
+++ b/test/TriGTests/trig-syntax-bad-esc-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-kw-01.trig b/test/TriGTests/trig-syntax-bad-kw-01.trig
index 75753b2d..75753b2d 100644
--- a/tests/TriGTests/trig-syntax-bad-kw-01.trig
+++ b/test/TriGTests/trig-syntax-bad-kw-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-kw-02.trig b/test/TriGTests/trig-syntax-bad-kw-02.trig
index 036179dd..036179dd 100644
--- a/tests/TriGTests/trig-syntax-bad-kw-02.trig
+++ b/test/TriGTests/trig-syntax-bad-kw-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-kw-03.trig b/test/TriGTests/trig-syntax-bad-kw-03.trig
index 84f456e5..84f456e5 100644
--- a/tests/TriGTests/trig-syntax-bad-kw-03.trig
+++ b/test/TriGTests/trig-syntax-bad-kw-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-kw-04.trig b/test/TriGTests/trig-syntax-bad-kw-04.trig
index 28d864c4..28d864c4 100644
--- a/tests/TriGTests/trig-syntax-bad-kw-04.trig
+++ b/test/TriGTests/trig-syntax-bad-kw-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-kw-05.trig b/test/TriGTests/trig-syntax-bad-kw-05.trig
index c12694bf..c12694bf 100644
--- a/tests/TriGTests/trig-syntax-bad-kw-05.trig
+++ b/test/TriGTests/trig-syntax-bad-kw-05.trig
diff --git a/tests/TriGTests/trig-syntax-bad-lang-01.trig b/test/TriGTests/trig-syntax-bad-lang-01.trig
index a2032634..a2032634 100644
--- a/tests/TriGTests/trig-syntax-bad-lang-01.trig
+++ b/test/TriGTests/trig-syntax-bad-lang-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-list-01.trig b/test/TriGTests/trig-syntax-bad-list-01.trig
index 15d82710..15d82710 100644
--- a/tests/TriGTests/trig-syntax-bad-list-01.trig
+++ b/test/TriGTests/trig-syntax-bad-list-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-list-02.trig b/test/TriGTests/trig-syntax-bad-list-02.trig
index 15d82710..15d82710 100644
--- a/tests/TriGTests/trig-syntax-bad-list-02.trig
+++ b/test/TriGTests/trig-syntax-bad-list-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-list-03.trig b/test/TriGTests/trig-syntax-bad-list-03.trig
index 6b5269dd..6b5269dd 100644
--- a/tests/TriGTests/trig-syntax-bad-list-03.trig
+++ b/test/TriGTests/trig-syntax-bad-list-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-list-04.trig b/test/TriGTests/trig-syntax-bad-list-04.trig
index 377846a9..377846a9 100644
--- a/tests/TriGTests/trig-syntax-bad-list-04.trig
+++ b/test/TriGTests/trig-syntax-bad-list-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-ln-dash-start.trig b/test/TriGTests/trig-syntax-bad-ln-dash-start.trig
index 48f78eed..48f78eed 100644
--- a/tests/TriGTests/trig-syntax-bad-ln-dash-start.trig
+++ b/test/TriGTests/trig-syntax-bad-ln-dash-start.trig
diff --git a/tests/TriGTests/trig-syntax-bad-ln-escape-start.trig b/test/TriGTests/trig-syntax-bad-ln-escape-start.trig
index d3e71e4e..d3e71e4e 100644
--- a/tests/TriGTests/trig-syntax-bad-ln-escape-start.trig
+++ b/test/TriGTests/trig-syntax-bad-ln-escape-start.trig
diff --git a/tests/TriGTests/trig-syntax-bad-ln-escape.trig b/test/TriGTests/trig-syntax-bad-ln-escape.trig
index dcdd0592..dcdd0592 100644
--- a/tests/TriGTests/trig-syntax-bad-ln-escape.trig
+++ b/test/TriGTests/trig-syntax-bad-ln-escape.trig
diff --git a/tests/TriGTests/trig-syntax-bad-missing-ns-dot-end.trig b/test/TriGTests/trig-syntax-bad-missing-ns-dot-end.trig
index 7fe09943..7fe09943 100644
--- a/tests/TriGTests/trig-syntax-bad-missing-ns-dot-end.trig
+++ b/test/TriGTests/trig-syntax-bad-missing-ns-dot-end.trig
diff --git a/tests/TriGTests/trig-syntax-bad-missing-ns-dot-start.trig b/test/TriGTests/trig-syntax-bad-missing-ns-dot-start.trig
index 3ae9b6bb..3ae9b6bb 100644
--- a/tests/TriGTests/trig-syntax-bad-missing-ns-dot-start.trig
+++ b/test/TriGTests/trig-syntax-bad-missing-ns-dot-start.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-01.trig b/test/TriGTests/trig-syntax-bad-n3-extras-01.trig
index 9dbf21e2..9dbf21e2 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-01.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-02.trig b/test/TriGTests/trig-syntax-bad-n3-extras-02.trig
index 8edf2c2b..8edf2c2b 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-02.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-03.trig b/test/TriGTests/trig-syntax-bad-n3-extras-03.trig
index bb21bf08..bb21bf08 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-03.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-04.trig b/test/TriGTests/trig-syntax-bad-n3-extras-04.trig
index adee6b55..adee6b55 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-04.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-05.trig b/test/TriGTests/trig-syntax-bad-n3-extras-05.trig
index 2fbf0840..2fbf0840 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-05.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-05.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-06.trig b/test/TriGTests/trig-syntax-bad-n3-extras-06.trig
index d1945544..d1945544 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-06.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-06.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-07.trig b/test/TriGTests/trig-syntax-bad-n3-extras-07.trig
index ece79325..ece79325 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-07.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-07.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-08.trig b/test/TriGTests/trig-syntax-bad-n3-extras-08.trig
index ece79325..ece79325 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-08.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-08.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-09.trig b/test/TriGTests/trig-syntax-bad-n3-extras-09.trig
index cc70bc12..cc70bc12 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-09.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-09.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-10.trig b/test/TriGTests/trig-syntax-bad-n3-extras-10.trig
index 7470dda3..7470dda3 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-10.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-10.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-11.trig b/test/TriGTests/trig-syntax-bad-n3-extras-11.trig
index dabadf02..dabadf02 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-11.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-11.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-12.trig b/test/TriGTests/trig-syntax-bad-n3-extras-12.trig
index 5a6c3562..5a6c3562 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-12.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-12.trig
diff --git a/tests/TriGTests/trig-syntax-bad-n3-extras-13.trig b/test/TriGTests/trig-syntax-bad-n3-extras-13.trig
index c4fe67a0..c4fe67a0 100644
--- a/tests/TriGTests/trig-syntax-bad-n3-extras-13.trig
+++ b/test/TriGTests/trig-syntax-bad-n3-extras-13.trig
diff --git a/tests/TriGTests/trig-syntax-bad-ns-dot-end.trig b/test/TriGTests/trig-syntax-bad-ns-dot-end.trig
index d2b53225..d2b53225 100644
--- a/tests/TriGTests/trig-syntax-bad-ns-dot-end.trig
+++ b/test/TriGTests/trig-syntax-bad-ns-dot-end.trig
diff --git a/tests/TriGTests/trig-syntax-bad-ns-dot-start.trig b/test/TriGTests/trig-syntax-bad-ns-dot-start.trig
index 9cebce12..9cebce12 100644
--- a/tests/TriGTests/trig-syntax-bad-ns-dot-start.trig
+++ b/test/TriGTests/trig-syntax-bad-ns-dot-start.trig
diff --git a/tests/TriGTests/trig-syntax-bad-num-01.trig b/test/TriGTests/trig-syntax-bad-num-01.trig
index 87fa61d4..87fa61d4 100644
--- a/tests/TriGTests/trig-syntax-bad-num-01.trig
+++ b/test/TriGTests/trig-syntax-bad-num-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-num-02.trig b/test/TriGTests/trig-syntax-bad-num-02.trig
index 4e257b08..4e257b08 100644
--- a/tests/TriGTests/trig-syntax-bad-num-02.trig
+++ b/test/TriGTests/trig-syntax-bad-num-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-num-03.trig b/test/TriGTests/trig-syntax-bad-num-03.trig
index 72414507..72414507 100644
--- a/tests/TriGTests/trig-syntax-bad-num-03.trig
+++ b/test/TriGTests/trig-syntax-bad-num-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-num-04.trig b/test/TriGTests/trig-syntax-bad-num-04.trig
index c5828732..c5828732 100644
--- a/tests/TriGTests/trig-syntax-bad-num-04.trig
+++ b/test/TriGTests/trig-syntax-bad-num-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-num-05.trig b/test/TriGTests/trig-syntax-bad-num-05.trig
index 7de52461..7de52461 100644
--- a/tests/TriGTests/trig-syntax-bad-num-05.trig
+++ b/test/TriGTests/trig-syntax-bad-num-05.trig
diff --git a/tests/TriGTests/trig-syntax-bad-number-dot-in-anon.trig b/test/TriGTests/trig-syntax-bad-number-dot-in-anon.trig
index 3c4b8e45..3c4b8e45 100644
--- a/tests/TriGTests/trig-syntax-bad-number-dot-in-anon.trig
+++ b/test/TriGTests/trig-syntax-bad-number-dot-in-anon.trig
diff --git a/tests/TriGTests/trig-syntax-bad-pname-01.trig b/test/TriGTests/trig-syntax-bad-pname-01.trig
index a03be7af..a03be7af 100644
--- a/tests/TriGTests/trig-syntax-bad-pname-01.trig
+++ b/test/TriGTests/trig-syntax-bad-pname-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-pname-02.trig b/test/TriGTests/trig-syntax-bad-pname-02.trig
index 39d14ee4..39d14ee4 100644
--- a/tests/TriGTests/trig-syntax-bad-pname-02.trig
+++ b/test/TriGTests/trig-syntax-bad-pname-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-pname-03.trig b/test/TriGTests/trig-syntax-bad-pname-03.trig
index 5ed44f65..5ed44f65 100644
--- a/tests/TriGTests/trig-syntax-bad-pname-03.trig
+++ b/test/TriGTests/trig-syntax-bad-pname-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-prefix-01.trig b/test/TriGTests/trig-syntax-bad-prefix-01.trig
index 32d781d1..32d781d1 100644
--- a/tests/TriGTests/trig-syntax-bad-prefix-01.trig
+++ b/test/TriGTests/trig-syntax-bad-prefix-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-prefix-02.trig b/test/TriGTests/trig-syntax-bad-prefix-02.trig
index 6d03cf5f..6d03cf5f 100644
--- a/tests/TriGTests/trig-syntax-bad-prefix-02.trig
+++ b/test/TriGTests/trig-syntax-bad-prefix-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-prefix-03.trig b/test/TriGTests/trig-syntax-bad-prefix-03.trig
index 1ab01e7b..1ab01e7b 100644
--- a/tests/TriGTests/trig-syntax-bad-prefix-03.trig
+++ b/test/TriGTests/trig-syntax-bad-prefix-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-prefix-04.trig b/test/TriGTests/trig-syntax-bad-prefix-04.trig
index dbbda05b..dbbda05b 100644
--- a/tests/TriGTests/trig-syntax-bad-prefix-04.trig
+++ b/test/TriGTests/trig-syntax-bad-prefix-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-prefix-05.trig b/test/TriGTests/trig-syntax-bad-prefix-05.trig
index 6d145e07..6d145e07 100644
--- a/tests/TriGTests/trig-syntax-bad-prefix-05.trig
+++ b/test/TriGTests/trig-syntax-bad-prefix-05.trig
diff --git a/tests/TriGTests/trig-syntax-bad-prefix-06.trig b/test/TriGTests/trig-syntax-bad-prefix-06.trig
index 52939065..52939065 100644
--- a/tests/TriGTests/trig-syntax-bad-prefix-06.trig
+++ b/test/TriGTests/trig-syntax-bad-prefix-06.trig
diff --git a/tests/TriGTests/trig-syntax-bad-prefix-07.trig b/test/TriGTests/trig-syntax-bad-prefix-07.trig
index 1230063a..1230063a 100644
--- a/tests/TriGTests/trig-syntax-bad-prefix-07.trig
+++ b/test/TriGTests/trig-syntax-bad-prefix-07.trig
diff --git a/tests/TriGTests/trig-syntax-bad-string-01.trig b/test/TriGTests/trig-syntax-bad-string-01.trig
index 9decfb3c..9decfb3c 100644
--- a/tests/TriGTests/trig-syntax-bad-string-01.trig
+++ b/test/TriGTests/trig-syntax-bad-string-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-string-02.trig b/test/TriGTests/trig-syntax-bad-string-02.trig
index 95537104..95537104 100644
--- a/tests/TriGTests/trig-syntax-bad-string-02.trig
+++ b/test/TriGTests/trig-syntax-bad-string-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-string-03.trig b/test/TriGTests/trig-syntax-bad-string-03.trig
index b60d18b8..b60d18b8 100644
--- a/tests/TriGTests/trig-syntax-bad-string-03.trig
+++ b/test/TriGTests/trig-syntax-bad-string-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-string-04.trig b/test/TriGTests/trig-syntax-bad-string-04.trig
index 06173937..06173937 100644
--- a/tests/TriGTests/trig-syntax-bad-string-04.trig
+++ b/test/TriGTests/trig-syntax-bad-string-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-string-05.trig b/test/TriGTests/trig-syntax-bad-string-05.trig
index 52e3fed4..52e3fed4 100644
--- a/tests/TriGTests/trig-syntax-bad-string-05.trig
+++ b/test/TriGTests/trig-syntax-bad-string-05.trig
diff --git a/tests/TriGTests/trig-syntax-bad-string-06.trig b/test/TriGTests/trig-syntax-bad-string-06.trig
index e4c9d936..e4c9d936 100644
--- a/tests/TriGTests/trig-syntax-bad-string-06.trig
+++ b/test/TriGTests/trig-syntax-bad-string-06.trig
diff --git a/tests/TriGTests/trig-syntax-bad-string-07.trig b/test/TriGTests/trig-syntax-bad-string-07.trig
index de68cb4a..de68cb4a 100644
--- a/tests/TriGTests/trig-syntax-bad-string-07.trig
+++ b/test/TriGTests/trig-syntax-bad-string-07.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-02.trig b/test/TriGTests/trig-syntax-bad-struct-02.trig
index 1f38c451..1f38c451 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-02.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-03.trig b/test/TriGTests/trig-syntax-bad-struct-03.trig
index b7e97b81..b7e97b81 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-03.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-04.trig b/test/TriGTests/trig-syntax-bad-struct-04.trig
index 319d1067..319d1067 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-04.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-05.trig b/test/TriGTests/trig-syntax-bad-struct-05.trig
index 317b6326..317b6326 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-05.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-05.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-06.trig b/test/TriGTests/trig-syntax-bad-struct-06.trig
index 8e6e7202..8e6e7202 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-06.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-06.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-07.trig b/test/TriGTests/trig-syntax-bad-struct-07.trig
index 91152ba3..91152ba3 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-07.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-07.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-09.trig b/test/TriGTests/trig-syntax-bad-struct-09.trig
index abc20261..abc20261 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-09.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-09.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-10.trig b/test/TriGTests/trig-syntax-bad-struct-10.trig
index 5d5c58fa..5d5c58fa 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-10.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-10.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-12.trig b/test/TriGTests/trig-syntax-bad-struct-12.trig
index b7bdff6a..b7bdff6a 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-12.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-12.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-13.trig b/test/TriGTests/trig-syntax-bad-struct-13.trig
index 0712e0f0..0712e0f0 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-13.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-13.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-14.trig b/test/TriGTests/trig-syntax-bad-struct-14.trig
index 69bc9c21..69bc9c21 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-14.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-14.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-15.trig b/test/TriGTests/trig-syntax-bad-struct-15.trig
index 27be5519..27be5519 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-15.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-15.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-16.trig b/test/TriGTests/trig-syntax-bad-struct-16.trig
index b08748f4..b08748f4 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-16.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-16.trig
diff --git a/tests/TriGTests/trig-syntax-bad-struct-17.trig b/test/TriGTests/trig-syntax-bad-struct-17.trig
index cdd301a1..cdd301a1 100644
--- a/tests/TriGTests/trig-syntax-bad-struct-17.trig
+++ b/test/TriGTests/trig-syntax-bad-struct-17.trig
diff --git a/tests/TriGTests/trig-syntax-bad-uri-01.trig b/test/TriGTests/trig-syntax-bad-uri-01.trig
index ed06b92d..ed06b92d 100644
--- a/tests/TriGTests/trig-syntax-bad-uri-01.trig
+++ b/test/TriGTests/trig-syntax-bad-uri-01.trig
diff --git a/tests/TriGTests/trig-syntax-bad-uri-02.trig b/test/TriGTests/trig-syntax-bad-uri-02.trig
index fb862172..fb862172 100644
--- a/tests/TriGTests/trig-syntax-bad-uri-02.trig
+++ b/test/TriGTests/trig-syntax-bad-uri-02.trig
diff --git a/tests/TriGTests/trig-syntax-bad-uri-03.trig b/test/TriGTests/trig-syntax-bad-uri-03.trig
index 7fa62dcc..7fa62dcc 100644
--- a/tests/TriGTests/trig-syntax-bad-uri-03.trig
+++ b/test/TriGTests/trig-syntax-bad-uri-03.trig
diff --git a/tests/TriGTests/trig-syntax-bad-uri-04.trig b/test/TriGTests/trig-syntax-bad-uri-04.trig
index ba9cd2d7..ba9cd2d7 100644
--- a/tests/TriGTests/trig-syntax-bad-uri-04.trig
+++ b/test/TriGTests/trig-syntax-bad-uri-04.trig
diff --git a/tests/TriGTests/trig-syntax-bad-uri-05.trig b/test/TriGTests/trig-syntax-bad-uri-05.trig
index d332a6e6..d332a6e6 100644
--- a/tests/TriGTests/trig-syntax-bad-uri-05.trig
+++ b/test/TriGTests/trig-syntax-bad-uri-05.trig
diff --git a/tests/TriGTests/trig-syntax-base-01.trig b/test/TriGTests/trig-syntax-base-01.trig
index dff1b3b4..dff1b3b4 100644
--- a/tests/TriGTests/trig-syntax-base-01.trig
+++ b/test/TriGTests/trig-syntax-base-01.trig
diff --git a/tests/TriGTests/trig-syntax-base-02.trig b/test/TriGTests/trig-syntax-base-02.trig
index 04f1bfdb..04f1bfdb 100644
--- a/tests/TriGTests/trig-syntax-base-02.trig
+++ b/test/TriGTests/trig-syntax-base-02.trig
diff --git a/tests/TriGTests/trig-syntax-base-03.trig b/test/TriGTests/trig-syntax-base-03.trig
index 2b7ae01d..2b7ae01d 100644
--- a/tests/TriGTests/trig-syntax-base-03.trig
+++ b/test/TriGTests/trig-syntax-base-03.trig
diff --git a/tests/TriGTests/trig-syntax-base-04.trig b/test/TriGTests/trig-syntax-base-04.trig
index ad742cff..ad742cff 100644
--- a/tests/TriGTests/trig-syntax-base-04.trig
+++ b/test/TriGTests/trig-syntax-base-04.trig
diff --git a/tests/TriGTests/trig-syntax-blank-label.trig b/test/TriGTests/trig-syntax-blank-label.trig
index 2cebf8f5..2cebf8f5 100644
--- a/tests/TriGTests/trig-syntax-blank-label.trig
+++ b/test/TriGTests/trig-syntax-blank-label.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-01.trig b/test/TriGTests/trig-syntax-bnode-01.trig
index 50c66c4d..50c66c4d 100644
--- a/tests/TriGTests/trig-syntax-bnode-01.trig
+++ b/test/TriGTests/trig-syntax-bnode-01.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-02.trig b/test/TriGTests/trig-syntax-bnode-02.trig
index 745dc11c..745dc11c 100644
--- a/tests/TriGTests/trig-syntax-bnode-02.trig
+++ b/test/TriGTests/trig-syntax-bnode-02.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-03.trig b/test/TriGTests/trig-syntax-bnode-03.trig
index 292b2791..292b2791 100644
--- a/tests/TriGTests/trig-syntax-bnode-03.trig
+++ b/test/TriGTests/trig-syntax-bnode-03.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-04.trig b/test/TriGTests/trig-syntax-bnode-04.trig
index 7bde07d6..7bde07d6 100644
--- a/tests/TriGTests/trig-syntax-bnode-04.trig
+++ b/test/TriGTests/trig-syntax-bnode-04.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-05.trig b/test/TriGTests/trig-syntax-bnode-05.trig
index 86419083..86419083 100644
--- a/tests/TriGTests/trig-syntax-bnode-05.trig
+++ b/test/TriGTests/trig-syntax-bnode-05.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-06.trig b/test/TriGTests/trig-syntax-bnode-06.trig
index 4f06e5fc..4f06e5fc 100644
--- a/tests/TriGTests/trig-syntax-bnode-06.trig
+++ b/test/TriGTests/trig-syntax-bnode-06.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-07.trig b/test/TriGTests/trig-syntax-bnode-07.trig
index 001e9ba0..001e9ba0 100644
--- a/tests/TriGTests/trig-syntax-bnode-07.trig
+++ b/test/TriGTests/trig-syntax-bnode-07.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-08.trig b/test/TriGTests/trig-syntax-bnode-08.trig
index 853ab8af..853ab8af 100644
--- a/tests/TriGTests/trig-syntax-bnode-08.trig
+++ b/test/TriGTests/trig-syntax-bnode-08.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-09.trig b/test/TriGTests/trig-syntax-bnode-09.trig
index 36b1eca8..36b1eca8 100644
--- a/tests/TriGTests/trig-syntax-bnode-09.trig
+++ b/test/TriGTests/trig-syntax-bnode-09.trig
diff --git a/tests/TriGTests/trig-syntax-bnode-10.trig b/test/TriGTests/trig-syntax-bnode-10.trig
index b6d308dd..b6d308dd 100644
--- a/tests/TriGTests/trig-syntax-bnode-10.trig
+++ b/test/TriGTests/trig-syntax-bnode-10.trig
diff --git a/tests/TriGTests/trig-syntax-datatypes-01.trig b/test/TriGTests/trig-syntax-datatypes-01.trig
index 304793af..304793af 100644
--- a/tests/TriGTests/trig-syntax-datatypes-01.trig
+++ b/test/TriGTests/trig-syntax-datatypes-01.trig
diff --git a/tests/TriGTests/trig-syntax-datatypes-02.trig b/test/TriGTests/trig-syntax-datatypes-02.trig
index 7daeb166..7daeb166 100644
--- a/tests/TriGTests/trig-syntax-datatypes-02.trig
+++ b/test/TriGTests/trig-syntax-datatypes-02.trig
diff --git a/tests/TriGTests/trig-syntax-file-01.trig b/test/TriGTests/trig-syntax-file-01.trig
index e69de29b..e69de29b 100644
--- a/tests/TriGTests/trig-syntax-file-01.trig
+++ b/test/TriGTests/trig-syntax-file-01.trig
diff --git a/tests/TriGTests/trig-syntax-file-02.trig b/test/TriGTests/trig-syntax-file-02.trig
index e6d327d5..e6d327d5 100644
--- a/tests/TriGTests/trig-syntax-file-02.trig
+++ b/test/TriGTests/trig-syntax-file-02.trig
diff --git a/tests/TriGTests/trig-syntax-file-03.trig b/test/TriGTests/trig-syntax-file-03.trig
index a9ca0358..a9ca0358 100644
--- a/tests/TriGTests/trig-syntax-file-03.trig
+++ b/test/TriGTests/trig-syntax-file-03.trig
diff --git a/tests/TriGTests/trig-syntax-kw-01.trig b/test/TriGTests/trig-syntax-kw-01.trig
index c1a426bb..c1a426bb 100644
--- a/tests/TriGTests/trig-syntax-kw-01.trig
+++ b/test/TriGTests/trig-syntax-kw-01.trig
diff --git a/tests/TriGTests/trig-syntax-kw-02.trig b/test/TriGTests/trig-syntax-kw-02.trig
index 7ceaee70..7ceaee70 100644
--- a/tests/TriGTests/trig-syntax-kw-02.trig
+++ b/test/TriGTests/trig-syntax-kw-02.trig
diff --git a/tests/TriGTests/trig-syntax-kw-03.trig b/test/TriGTests/trig-syntax-kw-03.trig
index 3c9e1405..3c9e1405 100644
--- a/tests/TriGTests/trig-syntax-kw-03.trig
+++ b/test/TriGTests/trig-syntax-kw-03.trig
diff --git a/tests/TriGTests/trig-syntax-lists-01.trig b/test/TriGTests/trig-syntax-lists-01.trig
index ff2de971..ff2de971 100644
--- a/tests/TriGTests/trig-syntax-lists-01.trig
+++ b/test/TriGTests/trig-syntax-lists-01.trig
diff --git a/tests/TriGTests/trig-syntax-lists-02.trig b/test/TriGTests/trig-syntax-lists-02.trig
index cce118aa..cce118aa 100644
--- a/tests/TriGTests/trig-syntax-lists-02.trig
+++ b/test/TriGTests/trig-syntax-lists-02.trig
diff --git a/tests/TriGTests/trig-syntax-lists-03.trig b/test/TriGTests/trig-syntax-lists-03.trig
index ee59d4c1..ee59d4c1 100644
--- a/tests/TriGTests/trig-syntax-lists-03.trig
+++ b/test/TriGTests/trig-syntax-lists-03.trig
diff --git a/tests/TriGTests/trig-syntax-lists-04.trig b/test/TriGTests/trig-syntax-lists-04.trig
index 6b26b478..6b26b478 100644
--- a/tests/TriGTests/trig-syntax-lists-04.trig
+++ b/test/TriGTests/trig-syntax-lists-04.trig
diff --git a/tests/TriGTests/trig-syntax-lists-05.trig b/test/TriGTests/trig-syntax-lists-05.trig
index 9e103cdd..9e103cdd 100644
--- a/tests/TriGTests/trig-syntax-lists-05.trig
+++ b/test/TriGTests/trig-syntax-lists-05.trig
diff --git a/tests/TriGTests/trig-syntax-ln-colons.trig b/test/TriGTests/trig-syntax-ln-colons.trig
index d0fd5d45..d0fd5d45 100644
--- a/tests/TriGTests/trig-syntax-ln-colons.trig
+++ b/test/TriGTests/trig-syntax-ln-colons.trig
diff --git a/tests/TriGTests/trig-syntax-ln-dots.trig b/test/TriGTests/trig-syntax-ln-dots.trig
index f420e8a9..f420e8a9 100644
--- a/tests/TriGTests/trig-syntax-ln-dots.trig
+++ b/test/TriGTests/trig-syntax-ln-dots.trig
diff --git a/tests/TriGTests/trig-syntax-minimal-whitespace-01.trig b/test/TriGTests/trig-syntax-minimal-whitespace-01.trig
index f53451f8..f53451f8 100644
--- a/tests/TriGTests/trig-syntax-minimal-whitespace-01.trig
+++ b/test/TriGTests/trig-syntax-minimal-whitespace-01.trig
diff --git a/tests/TriGTests/trig-syntax-ns-dots.trig b/test/TriGTests/trig-syntax-ns-dots.trig
index 7526a125..7526a125 100644
--- a/tests/TriGTests/trig-syntax-ns-dots.trig
+++ b/test/TriGTests/trig-syntax-ns-dots.trig
diff --git a/tests/TriGTests/trig-syntax-number-01.trig b/test/TriGTests/trig-syntax-number-01.trig
index 45d9b177..45d9b177 100644
--- a/tests/TriGTests/trig-syntax-number-01.trig
+++ b/test/TriGTests/trig-syntax-number-01.trig
diff --git a/tests/TriGTests/trig-syntax-number-02.trig b/test/TriGTests/trig-syntax-number-02.trig
index 6cbb9b49..6cbb9b49 100644
--- a/tests/TriGTests/trig-syntax-number-02.trig
+++ b/test/TriGTests/trig-syntax-number-02.trig
diff --git a/tests/TriGTests/trig-syntax-number-03.trig b/test/TriGTests/trig-syntax-number-03.trig
index 69021b45..69021b45 100644
--- a/tests/TriGTests/trig-syntax-number-03.trig
+++ b/test/TriGTests/trig-syntax-number-03.trig
diff --git a/tests/TriGTests/trig-syntax-number-04.trig b/test/TriGTests/trig-syntax-number-04.trig
index f826907c..f826907c 100644
--- a/tests/TriGTests/trig-syntax-number-04.trig
+++ b/test/TriGTests/trig-syntax-number-04.trig
diff --git a/tests/TriGTests/trig-syntax-number-05.trig b/test/TriGTests/trig-syntax-number-05.trig
index 72d44600..72d44600 100644
--- a/tests/TriGTests/trig-syntax-number-05.trig
+++ b/test/TriGTests/trig-syntax-number-05.trig
diff --git a/tests/TriGTests/trig-syntax-number-06.trig b/test/TriGTests/trig-syntax-number-06.trig
index adcbffd8..adcbffd8 100644
--- a/tests/TriGTests/trig-syntax-number-06.trig
+++ b/test/TriGTests/trig-syntax-number-06.trig
diff --git a/tests/TriGTests/trig-syntax-number-07.trig b/test/TriGTests/trig-syntax-number-07.trig
index a4802735..a4802735 100644
--- a/tests/TriGTests/trig-syntax-number-07.trig
+++ b/test/TriGTests/trig-syntax-number-07.trig
diff --git a/tests/TriGTests/trig-syntax-number-08.trig b/test/TriGTests/trig-syntax-number-08.trig
index b0093500..b0093500 100644
--- a/tests/TriGTests/trig-syntax-number-08.trig
+++ b/test/TriGTests/trig-syntax-number-08.trig
diff --git a/tests/TriGTests/trig-syntax-number-09.trig b/test/TriGTests/trig-syntax-number-09.trig
index 157456d2..157456d2 100644
--- a/tests/TriGTests/trig-syntax-number-09.trig
+++ b/test/TriGTests/trig-syntax-number-09.trig
diff --git a/tests/TriGTests/trig-syntax-number-10.trig b/test/TriGTests/trig-syntax-number-10.trig
index 1426fda6..1426fda6 100644
--- a/tests/TriGTests/trig-syntax-number-10.trig
+++ b/test/TriGTests/trig-syntax-number-10.trig
diff --git a/tests/TriGTests/trig-syntax-number-11.trig b/test/TriGTests/trig-syntax-number-11.trig
index 6ec517dd..6ec517dd 100644
--- a/tests/TriGTests/trig-syntax-number-11.trig
+++ b/test/TriGTests/trig-syntax-number-11.trig
diff --git a/tests/TriGTests/trig-syntax-pname-esc-01.trig b/test/TriGTests/trig-syntax-pname-esc-01.trig
index 4c7dd31d..4c7dd31d 100644
--- a/tests/TriGTests/trig-syntax-pname-esc-01.trig
+++ b/test/TriGTests/trig-syntax-pname-esc-01.trig
diff --git a/tests/TriGTests/trig-syntax-pname-esc-02.trig b/test/TriGTests/trig-syntax-pname-esc-02.trig
index 2e6bd389..2e6bd389 100644
--- a/tests/TriGTests/trig-syntax-pname-esc-02.trig
+++ b/test/TriGTests/trig-syntax-pname-esc-02.trig
diff --git a/tests/TriGTests/trig-syntax-pname-esc-03.trig b/test/TriGTests/trig-syntax-pname-esc-03.trig
index 433b9955..433b9955 100644
--- a/tests/TriGTests/trig-syntax-pname-esc-03.trig
+++ b/test/TriGTests/trig-syntax-pname-esc-03.trig
diff --git a/tests/TriGTests/trig-syntax-prefix-01.trig b/test/TriGTests/trig-syntax-prefix-01.trig
index 89e08cc7..89e08cc7 100644
--- a/tests/TriGTests/trig-syntax-prefix-01.trig
+++ b/test/TriGTests/trig-syntax-prefix-01.trig
diff --git a/tests/TriGTests/trig-syntax-prefix-02.trig b/test/TriGTests/trig-syntax-prefix-02.trig
index 5869e8bd..5869e8bd 100644
--- a/tests/TriGTests/trig-syntax-prefix-02.trig
+++ b/test/TriGTests/trig-syntax-prefix-02.trig
diff --git a/tests/TriGTests/trig-syntax-prefix-03.trig b/test/TriGTests/trig-syntax-prefix-03.trig
index beb18c03..beb18c03 100644
--- a/tests/TriGTests/trig-syntax-prefix-03.trig
+++ b/test/TriGTests/trig-syntax-prefix-03.trig
diff --git a/tests/TriGTests/trig-syntax-prefix-04.trig b/test/TriGTests/trig-syntax-prefix-04.trig
index 682cf0ae..682cf0ae 100644
--- a/tests/TriGTests/trig-syntax-prefix-04.trig
+++ b/test/TriGTests/trig-syntax-prefix-04.trig
diff --git a/tests/TriGTests/trig-syntax-prefix-05.trig b/test/TriGTests/trig-syntax-prefix-05.trig
index 7c463e7c..7c463e7c 100644
--- a/tests/TriGTests/trig-syntax-prefix-05.trig
+++ b/test/TriGTests/trig-syntax-prefix-05.trig
diff --git a/tests/TriGTests/trig-syntax-prefix-06.trig b/test/TriGTests/trig-syntax-prefix-06.trig
index b7a71c9a..b7a71c9a 100644
--- a/tests/TriGTests/trig-syntax-prefix-06.trig
+++ b/test/TriGTests/trig-syntax-prefix-06.trig
diff --git a/tests/TriGTests/trig-syntax-prefix-07.trig b/test/TriGTests/trig-syntax-prefix-07.trig
index 3337f3eb..3337f3eb 100644
--- a/tests/TriGTests/trig-syntax-prefix-07.trig
+++ b/test/TriGTests/trig-syntax-prefix-07.trig
diff --git a/tests/TriGTests/trig-syntax-prefix-08.trig b/test/TriGTests/trig-syntax-prefix-08.trig
index 669573aa..669573aa 100644
--- a/tests/TriGTests/trig-syntax-prefix-08.trig
+++ b/test/TriGTests/trig-syntax-prefix-08.trig
diff --git a/tests/TriGTests/trig-syntax-prefix-09.trig b/test/TriGTests/trig-syntax-prefix-09.trig
index ba50306c..ba50306c 100644
--- a/tests/TriGTests/trig-syntax-prefix-09.trig
+++ b/test/TriGTests/trig-syntax-prefix-09.trig
diff --git a/tests/TriGTests/trig-syntax-str-esc-01.trig b/test/TriGTests/trig-syntax-str-esc-01.trig
index 5db8be67..5db8be67 100644
--- a/tests/TriGTests/trig-syntax-str-esc-01.trig
+++ b/test/TriGTests/trig-syntax-str-esc-01.trig
diff --git a/tests/TriGTests/trig-syntax-str-esc-02.trig b/test/TriGTests/trig-syntax-str-esc-02.trig
index 57cbdd6d..57cbdd6d 100644
--- a/tests/TriGTests/trig-syntax-str-esc-02.trig
+++ b/test/TriGTests/trig-syntax-str-esc-02.trig
diff --git a/tests/TriGTests/trig-syntax-str-esc-03.trig b/test/TriGTests/trig-syntax-str-esc-03.trig
index 55f9b26f..55f9b26f 100644
--- a/tests/TriGTests/trig-syntax-str-esc-03.trig
+++ b/test/TriGTests/trig-syntax-str-esc-03.trig
diff --git a/tests/TriGTests/trig-syntax-string-01.trig b/test/TriGTests/trig-syntax-string-01.trig
index 72230b7f..72230b7f 100644
--- a/tests/TriGTests/trig-syntax-string-01.trig
+++ b/test/TriGTests/trig-syntax-string-01.trig
diff --git a/tests/TriGTests/trig-syntax-string-02.trig b/test/TriGTests/trig-syntax-string-02.trig
index a9ca8697..a9ca8697 100644
--- a/tests/TriGTests/trig-syntax-string-02.trig
+++ b/test/TriGTests/trig-syntax-string-02.trig
diff --git a/tests/TriGTests/trig-syntax-string-03.trig b/test/TriGTests/trig-syntax-string-03.trig
index 9dc53ef6..9dc53ef6 100644
--- a/tests/TriGTests/trig-syntax-string-03.trig
+++ b/test/TriGTests/trig-syntax-string-03.trig
diff --git a/tests/TriGTests/trig-syntax-string-04.trig b/test/TriGTests/trig-syntax-string-04.trig
index d5859b22..d5859b22 100644
--- a/tests/TriGTests/trig-syntax-string-04.trig
+++ b/test/TriGTests/trig-syntax-string-04.trig
diff --git a/tests/TriGTests/trig-syntax-string-05.trig b/test/TriGTests/trig-syntax-string-05.trig
index 10292cca..10292cca 100644
--- a/tests/TriGTests/trig-syntax-string-05.trig
+++ b/test/TriGTests/trig-syntax-string-05.trig
diff --git a/tests/TriGTests/trig-syntax-string-06.trig b/test/TriGTests/trig-syntax-string-06.trig
index 2ab1e863..2ab1e863 100644
--- a/tests/TriGTests/trig-syntax-string-06.trig
+++ b/test/TriGTests/trig-syntax-string-06.trig
diff --git a/tests/TriGTests/trig-syntax-string-07.trig b/test/TriGTests/trig-syntax-string-07.trig
index 98edec55..98edec55 100644
--- a/tests/TriGTests/trig-syntax-string-07.trig
+++ b/test/TriGTests/trig-syntax-string-07.trig
diff --git a/tests/TriGTests/trig-syntax-string-08.trig b/test/TriGTests/trig-syntax-string-08.trig
index 3612dec1..3612dec1 100644
--- a/tests/TriGTests/trig-syntax-string-08.trig
+++ b/test/TriGTests/trig-syntax-string-08.trig
diff --git a/tests/TriGTests/trig-syntax-string-09.trig b/test/TriGTests/trig-syntax-string-09.trig
index 5d98aea6..5d98aea6 100644
--- a/tests/TriGTests/trig-syntax-string-09.trig
+++ b/test/TriGTests/trig-syntax-string-09.trig
diff --git a/tests/TriGTests/trig-syntax-string-10.trig b/test/TriGTests/trig-syntax-string-10.trig
index f6112a2e..f6112a2e 100644
--- a/tests/TriGTests/trig-syntax-string-10.trig
+++ b/test/TriGTests/trig-syntax-string-10.trig
diff --git a/tests/TriGTests/trig-syntax-string-11.trig b/test/TriGTests/trig-syntax-string-11.trig
index 450dc549..450dc549 100644
--- a/tests/TriGTests/trig-syntax-string-11.trig
+++ b/test/TriGTests/trig-syntax-string-11.trig
diff --git a/tests/TriGTests/trig-syntax-struct-01.trig b/test/TriGTests/trig-syntax-struct-01.trig
index 52c26c1c..52c26c1c 100644
--- a/tests/TriGTests/trig-syntax-struct-01.trig
+++ b/test/TriGTests/trig-syntax-struct-01.trig
diff --git a/tests/TriGTests/trig-syntax-struct-02.trig b/test/TriGTests/trig-syntax-struct-02.trig
index 24535fad..24535fad 100644
--- a/tests/TriGTests/trig-syntax-struct-02.trig
+++ b/test/TriGTests/trig-syntax-struct-02.trig
diff --git a/tests/TriGTests/trig-syntax-struct-03.trig b/test/TriGTests/trig-syntax-struct-03.trig
index 43d81074..43d81074 100644
--- a/tests/TriGTests/trig-syntax-struct-03.trig
+++ b/test/TriGTests/trig-syntax-struct-03.trig
diff --git a/tests/TriGTests/trig-syntax-struct-04.trig b/test/TriGTests/trig-syntax-struct-04.trig
index 5a80fdf7..5a80fdf7 100644
--- a/tests/TriGTests/trig-syntax-struct-04.trig
+++ b/test/TriGTests/trig-syntax-struct-04.trig
diff --git a/tests/TriGTests/trig-syntax-struct-05.trig b/test/TriGTests/trig-syntax-struct-05.trig
index 3a756523..3a756523 100644
--- a/tests/TriGTests/trig-syntax-struct-05.trig
+++ b/test/TriGTests/trig-syntax-struct-05.trig
diff --git a/tests/TriGTests/trig-syntax-struct-06.trig b/test/TriGTests/trig-syntax-struct-06.trig
index 81a5135c..81a5135c 100644
--- a/tests/TriGTests/trig-syntax-struct-06.trig
+++ b/test/TriGTests/trig-syntax-struct-06.trig
diff --git a/tests/TriGTests/trig-syntax-struct-07.trig b/test/TriGTests/trig-syntax-struct-07.trig
index 45f09d34..45f09d34 100644
--- a/tests/TriGTests/trig-syntax-struct-07.trig
+++ b/test/TriGTests/trig-syntax-struct-07.trig
diff --git a/tests/TriGTests/trig-syntax-uri-01.trig b/test/TriGTests/trig-syntax-uri-01.trig
index 2f634298..2f634298 100644
--- a/tests/TriGTests/trig-syntax-uri-01.trig
+++ b/test/TriGTests/trig-syntax-uri-01.trig
diff --git a/tests/TriGTests/trig-syntax-uri-02.trig b/test/TriGTests/trig-syntax-uri-02.trig
index 2276868e..2276868e 100644
--- a/tests/TriGTests/trig-syntax-uri-02.trig
+++ b/test/TriGTests/trig-syntax-uri-02.trig
diff --git a/tests/TriGTests/trig-syntax-uri-03.trig b/test/TriGTests/trig-syntax-uri-03.trig
index 6467687a..6467687a 100644
--- a/tests/TriGTests/trig-syntax-uri-03.trig
+++ b/test/TriGTests/trig-syntax-uri-03.trig
diff --git a/tests/TriGTests/trig-syntax-uri-04.trig b/test/TriGTests/trig-syntax-uri-04.trig
index d4a6ed29..d4a6ed29 100644
--- a/tests/TriGTests/trig-syntax-uri-04.trig
+++ b/test/TriGTests/trig-syntax-uri-04.trig
diff --git a/tests/TriGTests/trig-turtle-01.trig b/test/TriGTests/trig-turtle-01.trig
index 785f04cb..785f04cb 100644
--- a/tests/TriGTests/trig-turtle-01.trig
+++ b/test/TriGTests/trig-turtle-01.trig
diff --git a/tests/TriGTests/trig-turtle-02.trig b/test/TriGTests/trig-turtle-02.trig
index 4dd160b6..4dd160b6 100644
--- a/tests/TriGTests/trig-turtle-02.trig
+++ b/test/TriGTests/trig-turtle-02.trig
diff --git a/tests/TriGTests/trig-turtle-03.trig b/test/TriGTests/trig-turtle-03.trig
index b58574d1..b58574d1 100644
--- a/tests/TriGTests/trig-turtle-03.trig
+++ b/test/TriGTests/trig-turtle-03.trig
diff --git a/tests/TriGTests/trig-turtle-04.trig b/test/TriGTests/trig-turtle-04.trig
index 50ed5133..50ed5133 100644
--- a/tests/TriGTests/trig-turtle-04.trig
+++ b/test/TriGTests/trig-turtle-04.trig
diff --git a/tests/TriGTests/trig-turtle-05.trig b/test/TriGTests/trig-turtle-05.trig
index 06aaf659..06aaf659 100644
--- a/tests/TriGTests/trig-turtle-05.trig
+++ b/test/TriGTests/trig-turtle-05.trig
diff --git a/tests/TriGTests/trig-turtle-06.trig b/test/TriGTests/trig-turtle-06.trig
index b69fddeb..b69fddeb 100644
--- a/tests/TriGTests/trig-turtle-06.trig
+++ b/test/TriGTests/trig-turtle-06.trig
diff --git a/tests/TriGTests/trig-turtle-bad-01.trig b/test/TriGTests/trig-turtle-bad-01.trig
index 1bad23f5..1bad23f5 100644
--- a/tests/TriGTests/trig-turtle-bad-01.trig
+++ b/test/TriGTests/trig-turtle-bad-01.trig
diff --git a/tests/TriGTests/trig-turtle-bad-02.trig b/test/TriGTests/trig-turtle-bad-02.trig
index f46fc1c5..f46fc1c5 100644
--- a/tests/TriGTests/trig-turtle-bad-02.trig
+++ b/test/TriGTests/trig-turtle-bad-02.trig
diff --git a/tests/TriGTests/two_LITERAL_LONG2s.nq b/test/TriGTests/two_LITERAL_LONG2s.nq
index af94fe6a..af94fe6a 100644
--- a/tests/TriGTests/two_LITERAL_LONG2s.nq
+++ b/test/TriGTests/two_LITERAL_LONG2s.nq
diff --git a/tests/TriGTests/two_LITERAL_LONG2s.trig b/test/TriGTests/two_LITERAL_LONG2s.trig
index 93aea524..93aea524 100644
--- a/tests/TriGTests/two_LITERAL_LONG2s.trig
+++ b/test/TriGTests/two_LITERAL_LONG2s.trig
diff --git a/tests/TriGTests/underscore_in_localName.nq b/test/TriGTests/underscore_in_localName.nq
index f9d0c4f1..f9d0c4f1 100644
--- a/tests/TriGTests/underscore_in_localName.nq
+++ b/test/TriGTests/underscore_in_localName.nq
diff --git a/tests/TriGTests/underscore_in_localName.trig b/test/TriGTests/underscore_in_localName.trig
index e10726bd..e10726bd 100644
--- a/tests/TriGTests/underscore_in_localName.trig
+++ b/test/TriGTests/underscore_in_localName.trig
diff --git a/tests/TurtleTests/HYPHEN_MINUS_in_localName.nt b/test/TurtleTests/HYPHEN_MINUS_in_localName.nt
index 25546b38..25546b38 100644
--- a/tests/TurtleTests/HYPHEN_MINUS_in_localName.nt
+++ b/test/TurtleTests/HYPHEN_MINUS_in_localName.nt
diff --git a/tests/TurtleTests/HYPHEN_MINUS_in_localName.ttl b/test/TurtleTests/HYPHEN_MINUS_in_localName.ttl
index 0340b8c8..0340b8c8 100644
--- a/tests/TurtleTests/HYPHEN_MINUS_in_localName.ttl
+++ b/test/TurtleTests/HYPHEN_MINUS_in_localName.ttl
diff --git a/tests/TurtleTests/IRIREF_datatype.nt b/test/TurtleTests/IRIREF_datatype.nt
index c333a5f6..c333a5f6 100644
--- a/tests/TurtleTests/IRIREF_datatype.nt
+++ b/test/TurtleTests/IRIREF_datatype.nt
diff --git a/tests/TurtleTests/IRIREF_datatype.ttl b/test/TurtleTests/IRIREF_datatype.ttl
index c333a5f6..c333a5f6 100644
--- a/tests/TurtleTests/IRIREF_datatype.ttl
+++ b/test/TurtleTests/IRIREF_datatype.ttl
diff --git a/tests/TurtleTests/IRI_spo.nt b/test/TurtleTests/IRI_spo.nt
index 01125e50..01125e50 100644
--- a/tests/TurtleTests/IRI_spo.nt
+++ b/test/TurtleTests/IRI_spo.nt
diff --git a/tests/TurtleTests/IRI_subject.ttl b/test/TurtleTests/IRI_subject.ttl
index 01125e50..01125e50 100644
--- a/tests/TurtleTests/IRI_subject.ttl
+++ b/test/TurtleTests/IRI_subject.ttl
diff --git a/tests/TurtleTests/IRI_with_all_punctuation.nt b/test/TurtleTests/IRI_with_all_punctuation.nt
index 94158773..94158773 100644
--- a/tests/TurtleTests/IRI_with_all_punctuation.nt
+++ b/test/TurtleTests/IRI_with_all_punctuation.nt
diff --git a/tests/TurtleTests/IRI_with_all_punctuation.ttl b/test/TurtleTests/IRI_with_all_punctuation.ttl
index 94158773..94158773 100644
--- a/tests/TurtleTests/IRI_with_all_punctuation.ttl
+++ b/test/TurtleTests/IRI_with_all_punctuation.ttl
diff --git a/tests/TurtleTests/IRI_with_eight_digit_numeric_escape.ttl b/test/TurtleTests/IRI_with_eight_digit_numeric_escape.ttl
index 434034e7..434034e7 100644
--- a/tests/TurtleTests/IRI_with_eight_digit_numeric_escape.ttl
+++ b/test/TurtleTests/IRI_with_eight_digit_numeric_escape.ttl
diff --git a/tests/TurtleTests/IRI_with_four_digit_numeric_escape.ttl b/test/TurtleTests/IRI_with_four_digit_numeric_escape.ttl
index 4163636e..4163636e 100644
--- a/tests/TurtleTests/IRI_with_four_digit_numeric_escape.ttl
+++ b/test/TurtleTests/IRI_with_four_digit_numeric_escape.ttl
diff --git a/tests/TurtleTests/LICENSE b/test/TurtleTests/LICENSE
index 1ac8f4e1..1ac8f4e1 100644
--- a/tests/TurtleTests/LICENSE
+++ b/test/TurtleTests/LICENSE
diff --git a/tests/TurtleTests/LITERAL1.nt b/test/TurtleTests/LITERAL1.nt
index 3aba89e4..3aba89e4 100644
--- a/tests/TurtleTests/LITERAL1.nt
+++ b/test/TurtleTests/LITERAL1.nt
diff --git a/tests/TurtleTests/LITERAL1.ttl b/test/TurtleTests/LITERAL1.ttl
index 725a2403..725a2403 100644
--- a/tests/TurtleTests/LITERAL1.ttl
+++ b/test/TurtleTests/LITERAL1.ttl
diff --git a/tests/TurtleTests/LITERAL1_all_controls.nt b/test/TurtleTests/LITERAL1_all_controls.nt
index 91c8af14..91c8af14 100644
--- a/tests/TurtleTests/LITERAL1_all_controls.nt
+++ b/test/TurtleTests/LITERAL1_all_controls.nt
diff --git a/tests/TurtleTests/LITERAL1_all_controls.ttl b/test/TurtleTests/LITERAL1_all_controls.ttl
index dbf3721c..dbf3721c 100644
--- a/tests/TurtleTests/LITERAL1_all_controls.ttl
+++ b/test/TurtleTests/LITERAL1_all_controls.ttl
diff --git a/tests/TurtleTests/LITERAL1_all_punctuation.nt b/test/TurtleTests/LITERAL1_all_punctuation.nt
index c25d818f..c25d818f 100644
--- a/tests/TurtleTests/LITERAL1_all_punctuation.nt
+++ b/test/TurtleTests/LITERAL1_all_punctuation.nt
diff --git a/tests/TurtleTests/LITERAL1_all_punctuation.ttl b/test/TurtleTests/LITERAL1_all_punctuation.ttl
index 7b1d9e54..7b1d9e54 100644
--- a/tests/TurtleTests/LITERAL1_all_punctuation.ttl
+++ b/test/TurtleTests/LITERAL1_all_punctuation.ttl
diff --git a/tests/TurtleTests/LITERAL1_ascii_boundaries.nt b/test/TurtleTests/LITERAL1_ascii_boundaries.nt
index 69c41447..69c41447 100644
--- a/tests/TurtleTests/LITERAL1_ascii_boundaries.nt
+++ b/test/TurtleTests/LITERAL1_ascii_boundaries.nt
diff --git a/tests/TurtleTests/LITERAL1_ascii_boundaries.ttl b/test/TurtleTests/LITERAL1_ascii_boundaries.ttl
index 7d65396f..7d65396f 100644
--- a/tests/TurtleTests/LITERAL1_ascii_boundaries.ttl
+++ b/test/TurtleTests/LITERAL1_ascii_boundaries.ttl
diff --git a/tests/TurtleTests/LITERAL1_with_UTF8_boundaries.ttl b/test/TurtleTests/LITERAL1_with_UTF8_boundaries.ttl
index b72eb040..b72eb040 100644
--- a/tests/TurtleTests/LITERAL1_with_UTF8_boundaries.ttl
+++ b/test/TurtleTests/LITERAL1_with_UTF8_boundaries.ttl
diff --git a/tests/TurtleTests/LITERAL2.ttl b/test/TurtleTests/LITERAL2.ttl
index 3aba89e4..3aba89e4 100644
--- a/tests/TurtleTests/LITERAL2.ttl
+++ b/test/TurtleTests/LITERAL2.ttl
diff --git a/tests/TurtleTests/LITERAL2_ascii_boundaries.nt b/test/TurtleTests/LITERAL2_ascii_boundaries.nt
index 270a51e3..270a51e3 100644
--- a/tests/TurtleTests/LITERAL2_ascii_boundaries.nt
+++ b/test/TurtleTests/LITERAL2_ascii_boundaries.nt
diff --git a/tests/TurtleTests/LITERAL2_ascii_boundaries.ttl b/test/TurtleTests/LITERAL2_ascii_boundaries.ttl
index 90b4cd69..90b4cd69 100644
--- a/tests/TurtleTests/LITERAL2_ascii_boundaries.ttl
+++ b/test/TurtleTests/LITERAL2_ascii_boundaries.ttl
diff --git a/tests/TurtleTests/LITERAL2_with_UTF8_boundaries.ttl b/test/TurtleTests/LITERAL2_with_UTF8_boundaries.ttl
index 0e1616db..0e1616db 100644
--- a/tests/TurtleTests/LITERAL2_with_UTF8_boundaries.ttl
+++ b/test/TurtleTests/LITERAL2_with_UTF8_boundaries.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG1.ttl b/test/TurtleTests/LITERAL_LONG1.ttl
index ab6baa93..ab6baa93 100644
--- a/tests/TurtleTests/LITERAL_LONG1.ttl
+++ b/test/TurtleTests/LITERAL_LONG1.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG1_ascii_boundaries.nt b/test/TurtleTests/LITERAL_LONG1_ascii_boundaries.nt
index a592b4a1..a592b4a1 100644
--- a/tests/TurtleTests/LITERAL_LONG1_ascii_boundaries.nt
+++ b/test/TurtleTests/LITERAL_LONG1_ascii_boundaries.nt
diff --git a/tests/TurtleTests/LITERAL_LONG1_ascii_boundaries.ttl b/test/TurtleTests/LITERAL_LONG1_ascii_boundaries.ttl
index f943e249..f943e249 100644
--- a/tests/TurtleTests/LITERAL_LONG1_ascii_boundaries.ttl
+++ b/test/TurtleTests/LITERAL_LONG1_ascii_boundaries.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG1_with_1_squote.nt b/test/TurtleTests/LITERAL_LONG1_with_1_squote.nt
index acf7f58f..acf7f58f 100644
--- a/tests/TurtleTests/LITERAL_LONG1_with_1_squote.nt
+++ b/test/TurtleTests/LITERAL_LONG1_with_1_squote.nt
diff --git a/tests/TurtleTests/LITERAL_LONG1_with_1_squote.ttl b/test/TurtleTests/LITERAL_LONG1_with_1_squote.ttl
index 3b93046b..3b93046b 100644
--- a/tests/TurtleTests/LITERAL_LONG1_with_1_squote.ttl
+++ b/test/TurtleTests/LITERAL_LONG1_with_1_squote.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG1_with_2_squotes.nt b/test/TurtleTests/LITERAL_LONG1_with_2_squotes.nt
index 8ddc52e8..8ddc52e8 100644
--- a/tests/TurtleTests/LITERAL_LONG1_with_2_squotes.nt
+++ b/test/TurtleTests/LITERAL_LONG1_with_2_squotes.nt
diff --git a/tests/TurtleTests/LITERAL_LONG1_with_2_squotes.ttl b/test/TurtleTests/LITERAL_LONG1_with_2_squotes.ttl
index 1219bad3..1219bad3 100644
--- a/tests/TurtleTests/LITERAL_LONG1_with_2_squotes.ttl
+++ b/test/TurtleTests/LITERAL_LONG1_with_2_squotes.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG1_with_UTF8_boundaries.ttl b/test/TurtleTests/LITERAL_LONG1_with_UTF8_boundaries.ttl
index e04b675e..e04b675e 100644
--- a/tests/TurtleTests/LITERAL_LONG1_with_UTF8_boundaries.ttl
+++ b/test/TurtleTests/LITERAL_LONG1_with_UTF8_boundaries.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG2.ttl b/test/TurtleTests/LITERAL_LONG2.ttl
index e37bf4a3..e37bf4a3 100644
--- a/tests/TurtleTests/LITERAL_LONG2.ttl
+++ b/test/TurtleTests/LITERAL_LONG2.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG2_ascii_boundaries.nt b/test/TurtleTests/LITERAL_LONG2_ascii_boundaries.nt
index 28785039..28785039 100644
--- a/tests/TurtleTests/LITERAL_LONG2_ascii_boundaries.nt
+++ b/test/TurtleTests/LITERAL_LONG2_ascii_boundaries.nt
diff --git a/tests/TurtleTests/LITERAL_LONG2_ascii_boundaries.ttl b/test/TurtleTests/LITERAL_LONG2_ascii_boundaries.ttl
index e919865f..e919865f 100644
--- a/tests/TurtleTests/LITERAL_LONG2_ascii_boundaries.ttl
+++ b/test/TurtleTests/LITERAL_LONG2_ascii_boundaries.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG2_with_1_squote.nt b/test/TurtleTests/LITERAL_LONG2_with_1_squote.nt
index 05a1fd3a..05a1fd3a 100644
--- a/tests/TurtleTests/LITERAL_LONG2_with_1_squote.nt
+++ b/test/TurtleTests/LITERAL_LONG2_with_1_squote.nt
diff --git a/tests/TurtleTests/LITERAL_LONG2_with_1_squote.ttl b/test/TurtleTests/LITERAL_LONG2_with_1_squote.ttl
index 80e389b8..80e389b8 100644
--- a/tests/TurtleTests/LITERAL_LONG2_with_1_squote.ttl
+++ b/test/TurtleTests/LITERAL_LONG2_with_1_squote.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG2_with_2_squotes.nt b/test/TurtleTests/LITERAL_LONG2_with_2_squotes.nt
index 3e69dc10..3e69dc10 100644
--- a/tests/TurtleTests/LITERAL_LONG2_with_2_squotes.nt
+++ b/test/TurtleTests/LITERAL_LONG2_with_2_squotes.nt
diff --git a/tests/TurtleTests/LITERAL_LONG2_with_2_squotes.ttl b/test/TurtleTests/LITERAL_LONG2_with_2_squotes.ttl
index 2f14f5b3..2f14f5b3 100644
--- a/tests/TurtleTests/LITERAL_LONG2_with_2_squotes.ttl
+++ b/test/TurtleTests/LITERAL_LONG2_with_2_squotes.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nt b/test/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nt
index 586e364d..586e364d 100644
--- a/tests/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nt
+++ b/test/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nt
diff --git a/tests/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.ttl b/test/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.ttl
index 2206e33b..2206e33b 100644
--- a/tests/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.ttl
+++ b/test/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.ttl
diff --git a/tests/TurtleTests/LITERAL_LONG2_with_UTF8_boundaries.ttl b/test/TurtleTests/LITERAL_LONG2_with_UTF8_boundaries.ttl
index 644b32d8..644b32d8 100644
--- a/tests/TurtleTests/LITERAL_LONG2_with_UTF8_boundaries.ttl
+++ b/test/TurtleTests/LITERAL_LONG2_with_UTF8_boundaries.ttl
diff --git a/tests/TurtleTests/LITERAL_with_UTF8_boundaries.nt b/test/TurtleTests/LITERAL_with_UTF8_boundaries.nt
index 47a2527a..47a2527a 100644
--- a/tests/TurtleTests/LITERAL_with_UTF8_boundaries.nt
+++ b/test/TurtleTests/LITERAL_with_UTF8_boundaries.nt
diff --git a/tests/TurtleTests/README b/test/TurtleTests/README
index 1b049b9c..1b049b9c 100644
--- a/tests/TurtleTests/README
+++ b/test/TurtleTests/README
diff --git a/tests/TurtleTests/SPARQL_style_base.ttl b/test/TurtleTests/SPARQL_style_base.ttl
index d134ea81..d134ea81 100644
--- a/tests/TurtleTests/SPARQL_style_base.ttl
+++ b/test/TurtleTests/SPARQL_style_base.ttl
diff --git a/tests/TurtleTests/SPARQL_style_prefix.ttl b/test/TurtleTests/SPARQL_style_prefix.ttl
index e7e4a3da..e7e4a3da 100644
--- a/tests/TurtleTests/SPARQL_style_prefix.ttl
+++ b/test/TurtleTests/SPARQL_style_prefix.ttl
diff --git a/tests/TurtleTests/anonymous_blank_node_object.nt b/test/TurtleTests/anonymous_blank_node_object.nt
index 89e88f63..89e88f63 100644
--- a/tests/TurtleTests/anonymous_blank_node_object.nt
+++ b/test/TurtleTests/anonymous_blank_node_object.nt
diff --git a/tests/TurtleTests/anonymous_blank_node_object.ttl b/test/TurtleTests/anonymous_blank_node_object.ttl
index 0b2ce436..0b2ce436 100644
--- a/tests/TurtleTests/anonymous_blank_node_object.ttl
+++ b/test/TurtleTests/anonymous_blank_node_object.ttl
diff --git a/tests/TurtleTests/anonymous_blank_node_subject.nt b/test/TurtleTests/anonymous_blank_node_subject.nt
index b48df9a7..b48df9a7 100644
--- a/tests/TurtleTests/anonymous_blank_node_subject.nt
+++ b/test/TurtleTests/anonymous_blank_node_subject.nt
diff --git a/tests/TurtleTests/anonymous_blank_node_subject.ttl b/test/TurtleTests/anonymous_blank_node_subject.ttl
index 17b378c2..17b378c2 100644
--- a/tests/TurtleTests/anonymous_blank_node_subject.ttl
+++ b/test/TurtleTests/anonymous_blank_node_subject.ttl
diff --git a/tests/TurtleTests/bareword_a_predicate.nt b/test/TurtleTests/bareword_a_predicate.nt
index afe14252..afe14252 100644
--- a/tests/TurtleTests/bareword_a_predicate.nt
+++ b/test/TurtleTests/bareword_a_predicate.nt
diff --git a/tests/TurtleTests/bareword_a_predicate.ttl b/test/TurtleTests/bareword_a_predicate.ttl
index 66fa0d0c..66fa0d0c 100644
--- a/tests/TurtleTests/bareword_a_predicate.ttl
+++ b/test/TurtleTests/bareword_a_predicate.ttl
diff --git a/tests/TurtleTests/bareword_decimal.nt b/test/TurtleTests/bareword_decimal.nt
index e177a9c6..e177a9c6 100644
--- a/tests/TurtleTests/bareword_decimal.nt
+++ b/test/TurtleTests/bareword_decimal.nt
diff --git a/tests/TurtleTests/bareword_decimal.ttl b/test/TurtleTests/bareword_decimal.ttl
index 20955d51..20955d51 100644
--- a/tests/TurtleTests/bareword_decimal.ttl
+++ b/test/TurtleTests/bareword_decimal.ttl
diff --git a/tests/TurtleTests/bareword_double.nt b/test/TurtleTests/bareword_double.nt
index dd8be2fd..dd8be2fd 100644
--- a/tests/TurtleTests/bareword_double.nt
+++ b/test/TurtleTests/bareword_double.nt
diff --git a/tests/TurtleTests/bareword_double.ttl b/test/TurtleTests/bareword_double.ttl
index 7ce25b11..7ce25b11 100644
--- a/tests/TurtleTests/bareword_double.ttl
+++ b/test/TurtleTests/bareword_double.ttl
diff --git a/tests/TurtleTests/bareword_integer.ttl b/test/TurtleTests/bareword_integer.ttl
index 087e71b6..087e71b6 100644
--- a/tests/TurtleTests/bareword_integer.ttl
+++ b/test/TurtleTests/bareword_integer.ttl
diff --git a/tests/TurtleTests/blankNodePropertyList_as_object.nt b/test/TurtleTests/blankNodePropertyList_as_object.nt
index 528bd844..528bd844 100644
--- a/tests/TurtleTests/blankNodePropertyList_as_object.nt
+++ b/test/TurtleTests/blankNodePropertyList_as_object.nt
diff --git a/tests/TurtleTests/blankNodePropertyList_as_object.ttl b/test/TurtleTests/blankNodePropertyList_as_object.ttl
index aa85a746..aa85a746 100644
--- a/tests/TurtleTests/blankNodePropertyList_as_object.ttl
+++ b/test/TurtleTests/blankNodePropertyList_as_object.ttl
diff --git a/tests/TurtleTests/blankNodePropertyList_as_subject.nt b/test/TurtleTests/blankNodePropertyList_as_subject.nt
index f0768879..f0768879 100644
--- a/tests/TurtleTests/blankNodePropertyList_as_subject.nt
+++ b/test/TurtleTests/blankNodePropertyList_as_subject.nt
diff --git a/tests/TurtleTests/blankNodePropertyList_as_subject.ttl b/test/TurtleTests/blankNodePropertyList_as_subject.ttl
index cb2e52aa..cb2e52aa 100644
--- a/tests/TurtleTests/blankNodePropertyList_as_subject.ttl
+++ b/test/TurtleTests/blankNodePropertyList_as_subject.ttl
diff --git a/tests/TurtleTests/blankNodePropertyList_containing_collection.nt b/test/TurtleTests/blankNodePropertyList_containing_collection.nt
index e590826b..e590826b 100644
--- a/tests/TurtleTests/blankNodePropertyList_containing_collection.nt
+++ b/test/TurtleTests/blankNodePropertyList_containing_collection.nt
diff --git a/tests/TurtleTests/blankNodePropertyList_containing_collection.ttl b/test/TurtleTests/blankNodePropertyList_containing_collection.ttl
index bf164c83..bf164c83 100644
--- a/tests/TurtleTests/blankNodePropertyList_containing_collection.ttl
+++ b/test/TurtleTests/blankNodePropertyList_containing_collection.ttl
diff --git a/tests/TurtleTests/blankNodePropertyList_with_multiple_triples.nt b/test/TurtleTests/blankNodePropertyList_with_multiple_triples.nt
index 8f3fc507..8f3fc507 100644
--- a/tests/TurtleTests/blankNodePropertyList_with_multiple_triples.nt
+++ b/test/TurtleTests/blankNodePropertyList_with_multiple_triples.nt
diff --git a/tests/TurtleTests/blankNodePropertyList_with_multiple_triples.ttl b/test/TurtleTests/blankNodePropertyList_with_multiple_triples.ttl
index 6153c13d..6153c13d 100644
--- a/tests/TurtleTests/blankNodePropertyList_with_multiple_triples.ttl
+++ b/test/TurtleTests/blankNodePropertyList_with_multiple_triples.ttl
diff --git a/tests/TurtleTests/collection_object.nt b/test/TurtleTests/collection_object.nt
index 391162e0..391162e0 100644
--- a/tests/TurtleTests/collection_object.nt
+++ b/test/TurtleTests/collection_object.nt
diff --git a/tests/TurtleTests/collection_object.ttl b/test/TurtleTests/collection_object.ttl
index 6af34715..6af34715 100644
--- a/tests/TurtleTests/collection_object.ttl
+++ b/test/TurtleTests/collection_object.ttl
diff --git a/tests/TurtleTests/collection_subject.nt b/test/TurtleTests/collection_subject.nt
index 502768c8..502768c8 100644
--- a/tests/TurtleTests/collection_subject.nt
+++ b/test/TurtleTests/collection_subject.nt
diff --git a/tests/TurtleTests/collection_subject.ttl b/test/TurtleTests/collection_subject.ttl
index 00a4c0bc..00a4c0bc 100644
--- a/tests/TurtleTests/collection_subject.ttl
+++ b/test/TurtleTests/collection_subject.ttl
diff --git a/tests/TurtleTests/comment_following_PNAME_NS.nt b/test/TurtleTests/comment_following_PNAME_NS.nt
index a8ca81c5..a8ca81c5 100644
--- a/tests/TurtleTests/comment_following_PNAME_NS.nt
+++ b/test/TurtleTests/comment_following_PNAME_NS.nt
diff --git a/tests/TurtleTests/comment_following_PNAME_NS.ttl b/test/TurtleTests/comment_following_PNAME_NS.ttl
index c03124c4..c03124c4 100644
--- a/tests/TurtleTests/comment_following_PNAME_NS.ttl
+++ b/test/TurtleTests/comment_following_PNAME_NS.ttl
diff --git a/tests/TurtleTests/comment_following_localName.ttl b/test/TurtleTests/comment_following_localName.ttl
index 919f876b..919f876b 100644
--- a/tests/TurtleTests/comment_following_localName.ttl
+++ b/test/TurtleTests/comment_following_localName.ttl
diff --git a/tests/TurtleTests/default_namespace_IRI.ttl b/test/TurtleTests/default_namespace_IRI.ttl
index f1f83fd5..f1f83fd5 100644
--- a/tests/TurtleTests/default_namespace_IRI.ttl
+++ b/test/TurtleTests/default_namespace_IRI.ttl
diff --git a/tests/TurtleTests/double_lower_case_e.nt b/test/TurtleTests/double_lower_case_e.nt
index 49a792b9..49a792b9 100644
--- a/tests/TurtleTests/double_lower_case_e.nt
+++ b/test/TurtleTests/double_lower_case_e.nt
diff --git a/tests/TurtleTests/double_lower_case_e.ttl b/test/TurtleTests/double_lower_case_e.ttl
index 5f4552bf..5f4552bf 100644
--- a/tests/TurtleTests/double_lower_case_e.ttl
+++ b/test/TurtleTests/double_lower_case_e.ttl
diff --git a/tests/TurtleTests/empty_collection.nt b/test/TurtleTests/empty_collection.nt
index 82726a3f..82726a3f 100644
--- a/tests/TurtleTests/empty_collection.nt
+++ b/test/TurtleTests/empty_collection.nt
diff --git a/tests/TurtleTests/empty_collection.ttl b/test/TurtleTests/empty_collection.ttl
index 02f9cc07..02f9cc07 100644
--- a/tests/TurtleTests/empty_collection.ttl
+++ b/test/TurtleTests/empty_collection.ttl
diff --git a/tests/TurtleTests/first.nt b/test/TurtleTests/first.nt
index d50539f6..d50539f6 100644
--- a/tests/TurtleTests/first.nt
+++ b/test/TurtleTests/first.nt
diff --git a/tests/TurtleTests/first.ttl b/test/TurtleTests/first.ttl
index 44f496cb..44f496cb 100644
--- a/tests/TurtleTests/first.ttl
+++ b/test/TurtleTests/first.ttl
diff --git a/tests/TurtleTests/labeled_blank_node_object.nt b/test/TurtleTests/labeled_blank_node_object.nt
index 2645d4ee..2645d4ee 100644
--- a/tests/TurtleTests/labeled_blank_node_object.nt
+++ b/test/TurtleTests/labeled_blank_node_object.nt
diff --git a/tests/TurtleTests/labeled_blank_node_object.ttl b/test/TurtleTests/labeled_blank_node_object.ttl
index 2645d4ee..2645d4ee 100644
--- a/tests/TurtleTests/labeled_blank_node_object.ttl
+++ b/test/TurtleTests/labeled_blank_node_object.ttl
diff --git a/tests/TurtleTests/labeled_blank_node_subject.nt b/test/TurtleTests/labeled_blank_node_subject.nt
index d0c7f458..d0c7f458 100644
--- a/tests/TurtleTests/labeled_blank_node_subject.nt
+++ b/test/TurtleTests/labeled_blank_node_subject.nt
diff --git a/tests/TurtleTests/labeled_blank_node_subject.ttl b/test/TurtleTests/labeled_blank_node_subject.ttl
index d0c7f458..d0c7f458 100644
--- a/tests/TurtleTests/labeled_blank_node_subject.ttl
+++ b/test/TurtleTests/labeled_blank_node_subject.ttl
diff --git a/tests/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nt b/test/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nt
index 50be8d6f..50be8d6f 100644
--- a/tests/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nt
+++ b/test/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nt
diff --git a/tests/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl b/test/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
index 50be8d6f..50be8d6f 100644
--- a/tests/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/tests/TurtleTests/labeled_blank_node_with_leading_digit.nt b/test/TurtleTests/labeled_blank_node_with_leading_digit.nt
index 7244d806..7244d806 100644
--- a/tests/TurtleTests/labeled_blank_node_with_leading_digit.nt
+++ b/test/TurtleTests/labeled_blank_node_with_leading_digit.nt
diff --git a/tests/TurtleTests/labeled_blank_node_with_leading_digit.ttl b/test/TurtleTests/labeled_blank_node_with_leading_digit.ttl
index 7244d806..7244d806 100644
--- a/tests/TurtleTests/labeled_blank_node_with_leading_digit.ttl
+++ b/test/TurtleTests/labeled_blank_node_with_leading_digit.ttl
diff --git a/tests/TurtleTests/labeled_blank_node_with_leading_underscore.nt b/test/TurtleTests/labeled_blank_node_with_leading_underscore.nt
index 15d9ffc8..15d9ffc8 100644
--- a/tests/TurtleTests/labeled_blank_node_with_leading_underscore.nt
+++ b/test/TurtleTests/labeled_blank_node_with_leading_underscore.nt
diff --git a/tests/TurtleTests/labeled_blank_node_with_leading_underscore.ttl b/test/TurtleTests/labeled_blank_node_with_leading_underscore.ttl
index 15d9ffc8..15d9ffc8 100644
--- a/tests/TurtleTests/labeled_blank_node_with_leading_underscore.ttl
+++ b/test/TurtleTests/labeled_blank_node_with_leading_underscore.ttl
diff --git a/tests/TurtleTests/labeled_blank_node_with_non_leading_extras.nt b/test/TurtleTests/labeled_blank_node_with_non_leading_extras.nt
index 5ae09b7c..5ae09b7c 100644
--- a/tests/TurtleTests/labeled_blank_node_with_non_leading_extras.nt
+++ b/test/TurtleTests/labeled_blank_node_with_non_leading_extras.nt
diff --git a/tests/TurtleTests/labeled_blank_node_with_non_leading_extras.ttl b/test/TurtleTests/labeled_blank_node_with_non_leading_extras.ttl
index 5ae09b7c..5ae09b7c 100644
--- a/tests/TurtleTests/labeled_blank_node_with_non_leading_extras.ttl
+++ b/test/TurtleTests/labeled_blank_node_with_non_leading_extras.ttl
diff --git a/tests/TurtleTests/langtagged_LONG.ttl b/test/TurtleTests/langtagged_LONG.ttl
index 2baefe5d..2baefe5d 100644
--- a/tests/TurtleTests/langtagged_LONG.ttl
+++ b/test/TurtleTests/langtagged_LONG.ttl
diff --git a/tests/TurtleTests/langtagged_LONG_with_subtag.nt b/test/TurtleTests/langtagged_LONG_with_subtag.nt
index 629cbf42..629cbf42 100644
--- a/tests/TurtleTests/langtagged_LONG_with_subtag.nt
+++ b/test/TurtleTests/langtagged_LONG_with_subtag.nt
diff --git a/tests/TurtleTests/langtagged_LONG_with_subtag.ttl b/test/TurtleTests/langtagged_LONG_with_subtag.ttl
index 7fd527c4..7fd527c4 100644
--- a/tests/TurtleTests/langtagged_LONG_with_subtag.ttl
+++ b/test/TurtleTests/langtagged_LONG_with_subtag.ttl
diff --git a/tests/TurtleTests/langtagged_non_LONG.nt b/test/TurtleTests/langtagged_non_LONG.nt
index 1bddb04e..1bddb04e 100644
--- a/tests/TurtleTests/langtagged_non_LONG.nt
+++ b/test/TurtleTests/langtagged_non_LONG.nt
diff --git a/tests/TurtleTests/langtagged_non_LONG.ttl b/test/TurtleTests/langtagged_non_LONG.ttl
index 1bddb04e..1bddb04e 100644
--- a/tests/TurtleTests/langtagged_non_LONG.ttl
+++ b/test/TurtleTests/langtagged_non_LONG.ttl
diff --git a/tests/TurtleTests/lantag_with_subtag.nt b/test/TurtleTests/lantag_with_subtag.nt
index 46c9d53a..46c9d53a 100644
--- a/tests/TurtleTests/lantag_with_subtag.nt
+++ b/test/TurtleTests/lantag_with_subtag.nt
diff --git a/tests/TurtleTests/lantag_with_subtag.ttl b/test/TurtleTests/lantag_with_subtag.ttl
index 46c9d53a..46c9d53a 100644
--- a/tests/TurtleTests/lantag_with_subtag.ttl
+++ b/test/TurtleTests/lantag_with_subtag.ttl
diff --git a/tests/TurtleTests/last.nt b/test/TurtleTests/last.nt
index 27c21b3d..27c21b3d 100644
--- a/tests/TurtleTests/last.nt
+++ b/test/TurtleTests/last.nt
diff --git a/tests/TurtleTests/last.ttl b/test/TurtleTests/last.ttl
index 1254c261..1254c261 100644
--- a/tests/TurtleTests/last.ttl
+++ b/test/TurtleTests/last.ttl
diff --git a/tests/TurtleTests/literal_false.nt b/test/TurtleTests/literal_false.nt
index 5bbbae84..5bbbae84 100644
--- a/tests/TurtleTests/literal_false.nt
+++ b/test/TurtleTests/literal_false.nt
diff --git a/tests/TurtleTests/literal_false.ttl b/test/TurtleTests/literal_false.ttl
index 6a32e362..6a32e362 100644
--- a/tests/TurtleTests/literal_false.ttl
+++ b/test/TurtleTests/literal_false.ttl
diff --git a/tests/TurtleTests/literal_true.nt b/test/TurtleTests/literal_true.nt
index 054b229f..054b229f 100644
--- a/tests/TurtleTests/literal_true.nt
+++ b/test/TurtleTests/literal_true.nt
diff --git a/tests/TurtleTests/literal_true.ttl b/test/TurtleTests/literal_true.ttl
index 6c5bb742..6c5bb742 100644
--- a/tests/TurtleTests/literal_true.ttl
+++ b/test/TurtleTests/literal_true.ttl
diff --git a/tests/TurtleTests/literal_with_BACKSPACE.nt b/test/TurtleTests/literal_with_BACKSPACE.nt
index 7dba113b..7dba113b 100644
--- a/tests/TurtleTests/literal_with_BACKSPACE.nt
+++ b/test/TurtleTests/literal_with_BACKSPACE.nt
diff --git a/tests/TurtleTests/literal_with_BACKSPACE.ttl b/test/TurtleTests/literal_with_BACKSPACE.ttl
index 17b2880f..17b2880f 100644
--- a/tests/TurtleTests/literal_with_BACKSPACE.ttl
+++ b/test/TurtleTests/literal_with_BACKSPACE.ttl
diff --git a/tests/TurtleTests/literal_with_CARRIAGE_RETURN.nt b/test/TurtleTests/literal_with_CARRIAGE_RETURN.nt
index 91b85c89..91b85c89 100644
--- a/tests/TurtleTests/literal_with_CARRIAGE_RETURN.nt
+++ b/test/TurtleTests/literal_with_CARRIAGE_RETURN.nt
diff --git a/tests/TurtleTests/literal_with_CARRIAGE_RETURN.ttl b/test/TurtleTests/literal_with_CARRIAGE_RETURN.ttl
index 3cd1d89c..3cd1d89c 100644
--- a/tests/TurtleTests/literal_with_CARRIAGE_RETURN.ttl
+++ b/test/TurtleTests/literal_with_CARRIAGE_RETURN.ttl
diff --git a/tests/TurtleTests/literal_with_CHARACTER_TABULATION.nt b/test/TurtleTests/literal_with_CHARACTER_TABULATION.nt
index a6a9d9f0..a6a9d9f0 100644
--- a/tests/TurtleTests/literal_with_CHARACTER_TABULATION.nt
+++ b/test/TurtleTests/literal_with_CHARACTER_TABULATION.nt
diff --git a/tests/TurtleTests/literal_with_CHARACTER_TABULATION.ttl b/test/TurtleTests/literal_with_CHARACTER_TABULATION.ttl
index 37fbd9d1..37fbd9d1 100644
--- a/tests/TurtleTests/literal_with_CHARACTER_TABULATION.ttl
+++ b/test/TurtleTests/literal_with_CHARACTER_TABULATION.ttl
diff --git a/tests/TurtleTests/literal_with_FORM_FEED.nt b/test/TurtleTests/literal_with_FORM_FEED.nt
index 2a4490b3..2a4490b3 100644
--- a/tests/TurtleTests/literal_with_FORM_FEED.nt
+++ b/test/TurtleTests/literal_with_FORM_FEED.nt
diff --git a/tests/TurtleTests/literal_with_FORM_FEED.ttl b/test/TurtleTests/literal_with_FORM_FEED.ttl
index 76d6ee77..76d6ee77 100644
--- a/tests/TurtleTests/literal_with_FORM_FEED.ttl
+++ b/test/TurtleTests/literal_with_FORM_FEED.ttl
diff --git a/tests/TurtleTests/literal_with_LINE_FEED.nt b/test/TurtleTests/literal_with_LINE_FEED.nt
index 462f97ac..462f97ac 100644
--- a/tests/TurtleTests/literal_with_LINE_FEED.nt
+++ b/test/TurtleTests/literal_with_LINE_FEED.nt
diff --git a/tests/TurtleTests/literal_with_LINE_FEED.ttl b/test/TurtleTests/literal_with_LINE_FEED.ttl
index 50cc8a8b..50cc8a8b 100644
--- a/tests/TurtleTests/literal_with_LINE_FEED.ttl
+++ b/test/TurtleTests/literal_with_LINE_FEED.ttl
diff --git a/tests/TurtleTests/literal_with_REVERSE_SOLIDUS.nt b/test/TurtleTests/literal_with_REVERSE_SOLIDUS.nt
index ebc846ed..ebc846ed 100644
--- a/tests/TurtleTests/literal_with_REVERSE_SOLIDUS.nt
+++ b/test/TurtleTests/literal_with_REVERSE_SOLIDUS.nt
diff --git a/tests/TurtleTests/literal_with_REVERSE_SOLIDUS.ttl b/test/TurtleTests/literal_with_REVERSE_SOLIDUS.ttl
index 380a3d04..380a3d04 100644
--- a/tests/TurtleTests/literal_with_REVERSE_SOLIDUS.ttl
+++ b/test/TurtleTests/literal_with_REVERSE_SOLIDUS.ttl
diff --git a/tests/TurtleTests/literal_with_escaped_BACKSPACE.ttl b/test/TurtleTests/literal_with_escaped_BACKSPACE.ttl
index 5284b9b6..5284b9b6 100644
--- a/tests/TurtleTests/literal_with_escaped_BACKSPACE.ttl
+++ b/test/TurtleTests/literal_with_escaped_BACKSPACE.ttl
diff --git a/tests/TurtleTests/literal_with_escaped_CARRIAGE_RETURN.ttl b/test/TurtleTests/literal_with_escaped_CARRIAGE_RETURN.ttl
index a28e7c0b..a28e7c0b 100644
--- a/tests/TurtleTests/literal_with_escaped_CARRIAGE_RETURN.ttl
+++ b/test/TurtleTests/literal_with_escaped_CARRIAGE_RETURN.ttl
diff --git a/tests/TurtleTests/literal_with_escaped_CHARACTER_TABULATION.ttl b/test/TurtleTests/literal_with_escaped_CHARACTER_TABULATION.ttl
index 67966f78..67966f78 100644
--- a/tests/TurtleTests/literal_with_escaped_CHARACTER_TABULATION.ttl
+++ b/test/TurtleTests/literal_with_escaped_CHARACTER_TABULATION.ttl
diff --git a/tests/TurtleTests/literal_with_escaped_FORM_FEED.ttl b/test/TurtleTests/literal_with_escaped_FORM_FEED.ttl
index 21acace9..21acace9 100644
--- a/tests/TurtleTests/literal_with_escaped_FORM_FEED.ttl
+++ b/test/TurtleTests/literal_with_escaped_FORM_FEED.ttl
diff --git a/tests/TurtleTests/literal_with_escaped_LINE_FEED.ttl b/test/TurtleTests/literal_with_escaped_LINE_FEED.ttl
index b53f49ec..b53f49ec 100644
--- a/tests/TurtleTests/literal_with_escaped_LINE_FEED.ttl
+++ b/test/TurtleTests/literal_with_escaped_LINE_FEED.ttl
diff --git a/tests/TurtleTests/literal_with_numeric_escape4.nt b/test/TurtleTests/literal_with_numeric_escape4.nt
index 0b35a89a..0b35a89a 100644
--- a/tests/TurtleTests/literal_with_numeric_escape4.nt
+++ b/test/TurtleTests/literal_with_numeric_escape4.nt
diff --git a/tests/TurtleTests/literal_with_numeric_escape4.ttl b/test/TurtleTests/literal_with_numeric_escape4.ttl
index 2b4e0175..2b4e0175 100644
--- a/tests/TurtleTests/literal_with_numeric_escape4.ttl
+++ b/test/TurtleTests/literal_with_numeric_escape4.ttl
diff --git a/tests/TurtleTests/literal_with_numeric_escape8.ttl b/test/TurtleTests/literal_with_numeric_escape8.ttl
index 8d0e4ef2..8d0e4ef2 100644
--- a/tests/TurtleTests/literal_with_numeric_escape8.ttl
+++ b/test/TurtleTests/literal_with_numeric_escape8.ttl
diff --git a/tests/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt b/test/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
index 4b60c9e1..4b60c9e1 100644
--- a/tests/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
+++ b/test/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
diff --git a/tests/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.ttl b/test/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.ttl
index c532e3d0..c532e3d0 100644
--- a/tests/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/tests/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt b/test/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
index 78ef1086..78ef1086 100644
--- a/tests/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
+++ b/test/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
diff --git a/tests/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.ttl b/test/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.ttl
index 15b23dd8..15b23dd8 100644
--- a/tests/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/tests/TurtleTests/localName_with_leading_digit.nt b/test/TurtleTests/localName_with_leading_digit.nt
index a9e101e5..a9e101e5 100644
--- a/tests/TurtleTests/localName_with_leading_digit.nt
+++ b/test/TurtleTests/localName_with_leading_digit.nt
diff --git a/tests/TurtleTests/localName_with_leading_digit.ttl b/test/TurtleTests/localName_with_leading_digit.ttl
index 65da2499..65da2499 100644
--- a/tests/TurtleTests/localName_with_leading_digit.ttl
+++ b/test/TurtleTests/localName_with_leading_digit.ttl
diff --git a/tests/TurtleTests/localName_with_leading_underscore.nt b/test/TurtleTests/localName_with_leading_underscore.nt
index e042a7b9..e042a7b9 100644
--- a/tests/TurtleTests/localName_with_leading_underscore.nt
+++ b/test/TurtleTests/localName_with_leading_underscore.nt
diff --git a/tests/TurtleTests/localName_with_leading_underscore.ttl b/test/TurtleTests/localName_with_leading_underscore.ttl
index 762ace98..762ace98 100644
--- a/tests/TurtleTests/localName_with_leading_underscore.ttl
+++ b/test/TurtleTests/localName_with_leading_underscore.ttl
diff --git a/tests/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt b/test/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
index 5b346919..5b346919 100644
--- a/tests/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
+++ b/test/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
diff --git a/tests/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.ttl b/test/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.ttl
index 0922d95d..0922d95d 100644
--- a/tests/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/tests/TurtleTests/localName_with_non_leading_extras.nt b/test/TurtleTests/localName_with_non_leading_extras.nt
index 749b98cd..749b98cd 100644
--- a/tests/TurtleTests/localName_with_non_leading_extras.nt
+++ b/test/TurtleTests/localName_with_non_leading_extras.nt
diff --git a/tests/TurtleTests/localName_with_non_leading_extras.ttl b/test/TurtleTests/localName_with_non_leading_extras.ttl
index db25a8a6..db25a8a6 100644
--- a/tests/TurtleTests/localName_with_non_leading_extras.ttl
+++ b/test/TurtleTests/localName_with_non_leading_extras.ttl
diff --git a/tests/TurtleTests/localname_with_COLON.nt b/test/TurtleTests/localname_with_COLON.nt
index eb966ca3..eb966ca3 100644
--- a/tests/TurtleTests/localname_with_COLON.nt
+++ b/test/TurtleTests/localname_with_COLON.nt
diff --git a/tests/TurtleTests/localname_with_COLON.ttl b/test/TurtleTests/localname_with_COLON.ttl
index 1d45f20f..1d45f20f 100644
--- a/tests/TurtleTests/localname_with_COLON.ttl
+++ b/test/TurtleTests/localname_with_COLON.ttl
diff --git a/tests/TurtleTests/manifest.ttl b/test/TurtleTests/manifest.ttl
index 0a24655e..0a24655e 100644
--- a/tests/TurtleTests/manifest.ttl
+++ b/test/TurtleTests/manifest.ttl
diff --git a/tests/TurtleTests/negative_numeric.nt b/test/TurtleTests/negative_numeric.nt
index 4baf628d..4baf628d 100644
--- a/tests/TurtleTests/negative_numeric.nt
+++ b/test/TurtleTests/negative_numeric.nt
diff --git a/tests/TurtleTests/negative_numeric.ttl b/test/TurtleTests/negative_numeric.ttl
index a6a7f57b..a6a7f57b 100644
--- a/tests/TurtleTests/negative_numeric.ttl
+++ b/test/TurtleTests/negative_numeric.ttl
diff --git a/tests/TurtleTests/nested_blankNodePropertyLists.nt b/test/TurtleTests/nested_blankNodePropertyLists.nt
index 5284c007..5284c007 100644
--- a/tests/TurtleTests/nested_blankNodePropertyLists.nt
+++ b/test/TurtleTests/nested_blankNodePropertyLists.nt
diff --git a/tests/TurtleTests/nested_blankNodePropertyLists.ttl b/test/TurtleTests/nested_blankNodePropertyLists.ttl
index a3e4681c..a3e4681c 100644
--- a/tests/TurtleTests/nested_blankNodePropertyLists.ttl
+++ b/test/TurtleTests/nested_blankNodePropertyLists.ttl
diff --git a/tests/TurtleTests/nested_collection.nt b/test/TurtleTests/nested_collection.nt
index eaea2847..eaea2847 100644
--- a/tests/TurtleTests/nested_collection.nt
+++ b/test/TurtleTests/nested_collection.nt
diff --git a/tests/TurtleTests/nested_collection.ttl b/test/TurtleTests/nested_collection.ttl
index 944e7c6b..944e7c6b 100644
--- a/tests/TurtleTests/nested_collection.ttl
+++ b/test/TurtleTests/nested_collection.ttl
diff --git a/tests/TurtleTests/number_sign_following_PNAME_NS.nt b/test/TurtleTests/number_sign_following_PNAME_NS.nt
index 82d9629a..82d9629a 100644
--- a/tests/TurtleTests/number_sign_following_PNAME_NS.nt
+++ b/test/TurtleTests/number_sign_following_PNAME_NS.nt
diff --git a/tests/TurtleTests/number_sign_following_PNAME_NS.ttl b/test/TurtleTests/number_sign_following_PNAME_NS.ttl
index 2003fa4d..2003fa4d 100644
--- a/tests/TurtleTests/number_sign_following_PNAME_NS.ttl
+++ b/test/TurtleTests/number_sign_following_PNAME_NS.ttl
diff --git a/tests/TurtleTests/number_sign_following_localName.nt b/test/TurtleTests/number_sign_following_localName.nt
index 5ae57b8d..5ae57b8d 100644
--- a/tests/TurtleTests/number_sign_following_localName.nt
+++ b/test/TurtleTests/number_sign_following_localName.nt
diff --git a/tests/TurtleTests/number_sign_following_localName.ttl b/test/TurtleTests/number_sign_following_localName.ttl
index a0e39ecd..a0e39ecd 100644
--- a/tests/TurtleTests/number_sign_following_localName.ttl
+++ b/test/TurtleTests/number_sign_following_localName.ttl
diff --git a/tests/TurtleTests/numeric_with_leading_0.nt b/test/TurtleTests/numeric_with_leading_0.nt
index 1df5c472..1df5c472 100644
--- a/tests/TurtleTests/numeric_with_leading_0.nt
+++ b/test/TurtleTests/numeric_with_leading_0.nt
diff --git a/tests/TurtleTests/numeric_with_leading_0.ttl b/test/TurtleTests/numeric_with_leading_0.ttl
index a5eac209..a5eac209 100644
--- a/tests/TurtleTests/numeric_with_leading_0.ttl
+++ b/test/TurtleTests/numeric_with_leading_0.ttl
diff --git a/tests/TurtleTests/objectList_with_two_objects.nt b/test/TurtleTests/objectList_with_two_objects.nt
index 7f8e9c0f..7f8e9c0f 100644
--- a/tests/TurtleTests/objectList_with_two_objects.nt
+++ b/test/TurtleTests/objectList_with_two_objects.nt
diff --git a/tests/TurtleTests/objectList_with_two_objects.ttl b/test/TurtleTests/objectList_with_two_objects.ttl
index b12f02d1..b12f02d1 100644
--- a/tests/TurtleTests/objectList_with_two_objects.ttl
+++ b/test/TurtleTests/objectList_with_two_objects.ttl
diff --git a/tests/TurtleTests/old_style_base.ttl b/test/TurtleTests/old_style_base.ttl
index f0f4c03c..f0f4c03c 100644
--- a/tests/TurtleTests/old_style_base.ttl
+++ b/test/TurtleTests/old_style_base.ttl
diff --git a/tests/TurtleTests/old_style_prefix.ttl b/test/TurtleTests/old_style_prefix.ttl
index 59595672..59595672 100644
--- a/tests/TurtleTests/old_style_prefix.ttl
+++ b/test/TurtleTests/old_style_prefix.ttl
diff --git a/tests/TurtleTests/percent_escaped_localName.nt b/test/TurtleTests/percent_escaped_localName.nt
index e0af4b62..e0af4b62 100644
--- a/tests/TurtleTests/percent_escaped_localName.nt
+++ b/test/TurtleTests/percent_escaped_localName.nt
diff --git a/tests/TurtleTests/percent_escaped_localName.ttl b/test/TurtleTests/percent_escaped_localName.ttl
index 0564ccab..0564ccab 100644
--- a/tests/TurtleTests/percent_escaped_localName.ttl
+++ b/test/TurtleTests/percent_escaped_localName.ttl
diff --git a/tests/TurtleTests/positive_numeric.nt b/test/TurtleTests/positive_numeric.nt
index 96e6086a..96e6086a 100644
--- a/tests/TurtleTests/positive_numeric.nt
+++ b/test/TurtleTests/positive_numeric.nt
diff --git a/tests/TurtleTests/positive_numeric.ttl b/test/TurtleTests/positive_numeric.ttl
index 606691d9..606691d9 100644
--- a/tests/TurtleTests/positive_numeric.ttl
+++ b/test/TurtleTests/positive_numeric.ttl
diff --git a/tests/TurtleTests/predicateObjectList_with_two_objectLists.nt b/test/TurtleTests/predicateObjectList_with_two_objectLists.nt
index 274182c7..274182c7 100644
--- a/tests/TurtleTests/predicateObjectList_with_two_objectLists.nt
+++ b/test/TurtleTests/predicateObjectList_with_two_objectLists.nt
diff --git a/tests/TurtleTests/predicateObjectList_with_two_objectLists.ttl b/test/TurtleTests/predicateObjectList_with_two_objectLists.ttl
index 337b132f..337b132f 100644
--- a/tests/TurtleTests/predicateObjectList_with_two_objectLists.ttl
+++ b/test/TurtleTests/predicateObjectList_with_two_objectLists.ttl
diff --git a/tests/TurtleTests/prefix_only_IRI.ttl b/test/TurtleTests/prefix_only_IRI.ttl
index 9ff66603..9ff66603 100644
--- a/tests/TurtleTests/prefix_only_IRI.ttl
+++ b/test/TurtleTests/prefix_only_IRI.ttl
diff --git a/tests/TurtleTests/prefix_reassigned_and_used.nt b/test/TurtleTests/prefix_reassigned_and_used.nt
index 68bc9efe..68bc9efe 100644
--- a/tests/TurtleTests/prefix_reassigned_and_used.nt
+++ b/test/TurtleTests/prefix_reassigned_and_used.nt
diff --git a/tests/TurtleTests/prefix_reassigned_and_used.ttl b/test/TurtleTests/prefix_reassigned_and_used.ttl
index 1f948597..1f948597 100644
--- a/tests/TurtleTests/prefix_reassigned_and_used.ttl
+++ b/test/TurtleTests/prefix_reassigned_and_used.ttl
diff --git a/tests/TurtleTests/prefix_with_PN_CHARS_BASE_character_boundaries.ttl b/test/TurtleTests/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
index bc436bd2..bc436bd2 100644
--- a/tests/TurtleTests/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/TurtleTests/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/tests/TurtleTests/prefix_with_non_leading_extras.ttl b/test/TurtleTests/prefix_with_non_leading_extras.ttl
index 193460a8..193460a8 100644
--- a/tests/TurtleTests/prefix_with_non_leading_extras.ttl
+++ b/test/TurtleTests/prefix_with_non_leading_extras.ttl
diff --git a/tests/TurtleTests/prefixed_IRI_object.ttl b/test/TurtleTests/prefixed_IRI_object.ttl
index c2d50362..c2d50362 100644
--- a/tests/TurtleTests/prefixed_IRI_object.ttl
+++ b/test/TurtleTests/prefixed_IRI_object.ttl
diff --git a/tests/TurtleTests/prefixed_IRI_predicate.ttl b/test/TurtleTests/prefixed_IRI_predicate.ttl
index 2c1e5cc7..2c1e5cc7 100644
--- a/tests/TurtleTests/prefixed_IRI_predicate.ttl
+++ b/test/TurtleTests/prefixed_IRI_predicate.ttl
diff --git a/tests/TurtleTests/prefixed_name_datatype.ttl b/test/TurtleTests/prefixed_name_datatype.ttl
index 4a526073..4a526073 100644
--- a/tests/TurtleTests/prefixed_name_datatype.ttl
+++ b/test/TurtleTests/prefixed_name_datatype.ttl
diff --git a/tests/TurtleTests/repeated_semis_at_end.ttl b/test/TurtleTests/repeated_semis_at_end.ttl
index 8a4d9356..8a4d9356 100644
--- a/tests/TurtleTests/repeated_semis_at_end.ttl
+++ b/test/TurtleTests/repeated_semis_at_end.ttl
diff --git a/tests/TurtleTests/repeated_semis_not_at_end.nt b/test/TurtleTests/repeated_semis_not_at_end.nt
index 9ac6005f..9ac6005f 100644
--- a/tests/TurtleTests/repeated_semis_not_at_end.nt
+++ b/test/TurtleTests/repeated_semis_not_at_end.nt
diff --git a/tests/TurtleTests/repeated_semis_not_at_end.ttl b/test/TurtleTests/repeated_semis_not_at_end.ttl
index 3c8144f3..3c8144f3 100644
--- a/tests/TurtleTests/repeated_semis_not_at_end.ttl
+++ b/test/TurtleTests/repeated_semis_not_at_end.ttl
diff --git a/tests/TurtleTests/reserved_escaped_localName.nt b/test/TurtleTests/reserved_escaped_localName.nt
index 1ee4f32e..1ee4f32e 100644
--- a/tests/TurtleTests/reserved_escaped_localName.nt
+++ b/test/TurtleTests/reserved_escaped_localName.nt
diff --git a/tests/TurtleTests/reserved_escaped_localName.ttl b/test/TurtleTests/reserved_escaped_localName.ttl
index ae97f8af..ae97f8af 100644
--- a/tests/TurtleTests/reserved_escaped_localName.ttl
+++ b/test/TurtleTests/reserved_escaped_localName.ttl
diff --git a/tests/TurtleTests/sole_blankNodePropertyList.nt b/test/TurtleTests/sole_blankNodePropertyList.nt
index b48df9a7..b48df9a7 100644
--- a/tests/TurtleTests/sole_blankNodePropertyList.nt
+++ b/test/TurtleTests/sole_blankNodePropertyList.nt
diff --git a/tests/TurtleTests/sole_blankNodePropertyList.ttl b/test/TurtleTests/sole_blankNodePropertyList.ttl
index 5cc300f3..5cc300f3 100644
--- a/tests/TurtleTests/sole_blankNodePropertyList.ttl
+++ b/test/TurtleTests/sole_blankNodePropertyList.ttl
diff --git a/tests/TurtleTests/turtle-eval-bad-01.ttl b/test/TurtleTests/turtle-eval-bad-01.ttl
index c9c458e8..c9c458e8 100644
--- a/tests/TurtleTests/turtle-eval-bad-01.ttl
+++ b/test/TurtleTests/turtle-eval-bad-01.ttl
diff --git a/tests/TurtleTests/turtle-eval-bad-02.ttl b/test/TurtleTests/turtle-eval-bad-02.ttl
index f2be6ea5..f2be6ea5 100644
--- a/tests/TurtleTests/turtle-eval-bad-02.ttl
+++ b/test/TurtleTests/turtle-eval-bad-02.ttl
diff --git a/tests/TurtleTests/turtle-eval-bad-03.ttl b/test/TurtleTests/turtle-eval-bad-03.ttl
index 1aec7ff9..1aec7ff9 100644
--- a/tests/TurtleTests/turtle-eval-bad-03.ttl
+++ b/test/TurtleTests/turtle-eval-bad-03.ttl
diff --git a/tests/TurtleTests/turtle-eval-bad-04.ttl b/test/TurtleTests/turtle-eval-bad-04.ttl
index 4b7601b3..4b7601b3 100644
--- a/tests/TurtleTests/turtle-eval-bad-04.ttl
+++ b/test/TurtleTests/turtle-eval-bad-04.ttl
diff --git a/tests/TurtleTests/turtle-eval-struct-01.nt b/test/TurtleTests/turtle-eval-struct-01.nt
index 2e2d5baf..2e2d5baf 100644
--- a/tests/TurtleTests/turtle-eval-struct-01.nt
+++ b/test/TurtleTests/turtle-eval-struct-01.nt
diff --git a/tests/TurtleTests/turtle-eval-struct-01.ttl b/test/TurtleTests/turtle-eval-struct-01.ttl
index 2e2d5baf..2e2d5baf 100644
--- a/tests/TurtleTests/turtle-eval-struct-01.ttl
+++ b/test/TurtleTests/turtle-eval-struct-01.ttl
diff --git a/tests/TurtleTests/turtle-eval-struct-02.nt b/test/TurtleTests/turtle-eval-struct-02.nt
index 6cdc856a..6cdc856a 100644
--- a/tests/TurtleTests/turtle-eval-struct-02.nt
+++ b/test/TurtleTests/turtle-eval-struct-02.nt
diff --git a/tests/TurtleTests/turtle-eval-struct-02.ttl b/test/TurtleTests/turtle-eval-struct-02.ttl
index 45b9ea05..45b9ea05 100644
--- a/tests/TurtleTests/turtle-eval-struct-02.ttl
+++ b/test/TurtleTests/turtle-eval-struct-02.ttl
diff --git a/tests/TurtleTests/turtle-subm-01.nt b/test/TurtleTests/turtle-subm-01.nt
index 9efa50de..9efa50de 100644
--- a/tests/TurtleTests/turtle-subm-01.nt
+++ b/test/TurtleTests/turtle-subm-01.nt
diff --git a/tests/TurtleTests/turtle-subm-01.ttl b/test/TurtleTests/turtle-subm-01.ttl
index 78da35e6..78da35e6 100644
--- a/tests/TurtleTests/turtle-subm-01.ttl
+++ b/test/TurtleTests/turtle-subm-01.ttl
diff --git a/tests/TurtleTests/turtle-subm-02.nt b/test/TurtleTests/turtle-subm-02.nt
index 5ccb5bd2..5ccb5bd2 100644
--- a/tests/TurtleTests/turtle-subm-02.nt
+++ b/test/TurtleTests/turtle-subm-02.nt
diff --git a/tests/TurtleTests/turtle-subm-02.ttl b/test/TurtleTests/turtle-subm-02.ttl
index 9070d2c4..9070d2c4 100644
--- a/tests/TurtleTests/turtle-subm-02.ttl
+++ b/test/TurtleTests/turtle-subm-02.ttl
diff --git a/tests/TurtleTests/turtle-subm-03.nt b/test/TurtleTests/turtle-subm-03.nt
index 99732ab3..99732ab3 100644
--- a/tests/TurtleTests/turtle-subm-03.nt
+++ b/test/TurtleTests/turtle-subm-03.nt
diff --git a/tests/TurtleTests/turtle-subm-03.ttl b/test/TurtleTests/turtle-subm-03.ttl
index a623f3c1..a623f3c1 100644
--- a/tests/TurtleTests/turtle-subm-03.ttl
+++ b/test/TurtleTests/turtle-subm-03.ttl
diff --git a/tests/TurtleTests/turtle-subm-04.nt b/test/TurtleTests/turtle-subm-04.nt
index d6ce9e8f..d6ce9e8f 100644
--- a/tests/TurtleTests/turtle-subm-04.nt
+++ b/test/TurtleTests/turtle-subm-04.nt
diff --git a/tests/TurtleTests/turtle-subm-04.ttl b/test/TurtleTests/turtle-subm-04.ttl
index 9179fa50..9179fa50 100644
--- a/tests/TurtleTests/turtle-subm-04.ttl
+++ b/test/TurtleTests/turtle-subm-04.ttl
diff --git a/tests/TurtleTests/turtle-subm-05.nt b/test/TurtleTests/turtle-subm-05.nt
index d5d01526..d5d01526 100644
--- a/tests/TurtleTests/turtle-subm-05.nt
+++ b/test/TurtleTests/turtle-subm-05.nt
diff --git a/tests/TurtleTests/turtle-subm-05.ttl b/test/TurtleTests/turtle-subm-05.ttl
index c5181479..c5181479 100644
--- a/tests/TurtleTests/turtle-subm-05.ttl
+++ b/test/TurtleTests/turtle-subm-05.ttl
diff --git a/tests/TurtleTests/turtle-subm-06.nt b/test/TurtleTests/turtle-subm-06.nt
index d440197f..d440197f 100644
--- a/tests/TurtleTests/turtle-subm-06.nt
+++ b/test/TurtleTests/turtle-subm-06.nt
diff --git a/tests/TurtleTests/turtle-subm-06.ttl b/test/TurtleTests/turtle-subm-06.ttl
index adcbcabd..adcbcabd 100644
--- a/tests/TurtleTests/turtle-subm-06.ttl
+++ b/test/TurtleTests/turtle-subm-06.ttl
diff --git a/tests/TurtleTests/turtle-subm-07.nt b/test/TurtleTests/turtle-subm-07.nt
index 49961ea6..49961ea6 100644
--- a/tests/TurtleTests/turtle-subm-07.nt
+++ b/test/TurtleTests/turtle-subm-07.nt
diff --git a/tests/TurtleTests/turtle-subm-07.ttl b/test/TurtleTests/turtle-subm-07.ttl
index 9c1005cc..9c1005cc 100644
--- a/tests/TurtleTests/turtle-subm-07.ttl
+++ b/test/TurtleTests/turtle-subm-07.ttl
diff --git a/tests/TurtleTests/turtle-subm-08.nt b/test/TurtleTests/turtle-subm-08.nt
index e62cede5..e62cede5 100644
--- a/tests/TurtleTests/turtle-subm-08.nt
+++ b/test/TurtleTests/turtle-subm-08.nt
diff --git a/tests/TurtleTests/turtle-subm-08.ttl b/test/TurtleTests/turtle-subm-08.ttl
index 84559403..84559403 100644
--- a/tests/TurtleTests/turtle-subm-08.ttl
+++ b/test/TurtleTests/turtle-subm-08.ttl
diff --git a/tests/TurtleTests/turtle-subm-09.nt b/test/TurtleTests/turtle-subm-09.nt
index a77939cd..a77939cd 100644
--- a/tests/TurtleTests/turtle-subm-09.nt
+++ b/test/TurtleTests/turtle-subm-09.nt
diff --git a/tests/TurtleTests/turtle-subm-09.ttl b/test/TurtleTests/turtle-subm-09.ttl
index adce0a20..adce0a20 100644
--- a/tests/TurtleTests/turtle-subm-09.ttl
+++ b/test/TurtleTests/turtle-subm-09.ttl
diff --git a/tests/TurtleTests/turtle-subm-10.nt b/test/TurtleTests/turtle-subm-10.nt
index c7164085..c7164085 100644
--- a/tests/TurtleTests/turtle-subm-10.nt
+++ b/test/TurtleTests/turtle-subm-10.nt
diff --git a/tests/TurtleTests/turtle-subm-10.ttl b/test/TurtleTests/turtle-subm-10.ttl
index 0afe1b0a..0afe1b0a 100644
--- a/tests/TurtleTests/turtle-subm-10.ttl
+++ b/test/TurtleTests/turtle-subm-10.ttl
diff --git a/tests/TurtleTests/turtle-subm-11.nt b/test/TurtleTests/turtle-subm-11.nt
index ff88aa6f..ff88aa6f 100644
--- a/tests/TurtleTests/turtle-subm-11.nt
+++ b/test/TurtleTests/turtle-subm-11.nt
diff --git a/tests/TurtleTests/turtle-subm-11.ttl b/test/TurtleTests/turtle-subm-11.ttl
index 5d36360e..5d36360e 100644
--- a/tests/TurtleTests/turtle-subm-11.ttl
+++ b/test/TurtleTests/turtle-subm-11.ttl
diff --git a/tests/TurtleTests/turtle-subm-12.nt b/test/TurtleTests/turtle-subm-12.nt
index f936a5b6..f936a5b6 100644
--- a/tests/TurtleTests/turtle-subm-12.nt
+++ b/test/TurtleTests/turtle-subm-12.nt
diff --git a/tests/TurtleTests/turtle-subm-12.ttl b/test/TurtleTests/turtle-subm-12.ttl
index 3de1a43f..3de1a43f 100644
--- a/tests/TurtleTests/turtle-subm-12.ttl
+++ b/test/TurtleTests/turtle-subm-12.ttl
diff --git a/tests/TurtleTests/turtle-subm-13.nt b/test/TurtleTests/turtle-subm-13.nt
index 67404a59..67404a59 100644
--- a/tests/TurtleTests/turtle-subm-13.nt
+++ b/test/TurtleTests/turtle-subm-13.nt
diff --git a/tests/TurtleTests/turtle-subm-13.ttl b/test/TurtleTests/turtle-subm-13.ttl
index 1fed9f5e..1fed9f5e 100644
--- a/tests/TurtleTests/turtle-subm-13.ttl
+++ b/test/TurtleTests/turtle-subm-13.ttl
diff --git a/tests/TurtleTests/turtle-subm-14.nt b/test/TurtleTests/turtle-subm-14.nt
index 195a1af7..195a1af7 100644
--- a/tests/TurtleTests/turtle-subm-14.nt
+++ b/test/TurtleTests/turtle-subm-14.nt
diff --git a/tests/TurtleTests/turtle-subm-14.ttl b/test/TurtleTests/turtle-subm-14.ttl
index a8be95be..a8be95be 100644
--- a/tests/TurtleTests/turtle-subm-14.ttl
+++ b/test/TurtleTests/turtle-subm-14.ttl
diff --git a/tests/TurtleTests/turtle-subm-15.nt b/test/TurtleTests/turtle-subm-15.nt
index 466edbb2..466edbb2 100644
--- a/tests/TurtleTests/turtle-subm-15.nt
+++ b/test/TurtleTests/turtle-subm-15.nt
diff --git a/tests/TurtleTests/turtle-subm-15.ttl b/test/TurtleTests/turtle-subm-15.ttl
index 86c453bd..86c453bd 100644
--- a/tests/TurtleTests/turtle-subm-15.ttl
+++ b/test/TurtleTests/turtle-subm-15.ttl
diff --git a/tests/TurtleTests/turtle-subm-16.nt b/test/TurtleTests/turtle-subm-16.nt
index 7726bbfc..7726bbfc 100644
--- a/tests/TurtleTests/turtle-subm-16.nt
+++ b/test/TurtleTests/turtle-subm-16.nt
diff --git a/tests/TurtleTests/turtle-subm-16.ttl b/test/TurtleTests/turtle-subm-16.ttl
index f5482d4a..f5482d4a 100644
--- a/tests/TurtleTests/turtle-subm-16.ttl
+++ b/test/TurtleTests/turtle-subm-16.ttl
diff --git a/tests/TurtleTests/turtle-subm-17.nt b/test/TurtleTests/turtle-subm-17.nt
index 2e2dbe40..2e2dbe40 100644
--- a/tests/TurtleTests/turtle-subm-17.nt
+++ b/test/TurtleTests/turtle-subm-17.nt
diff --git a/tests/TurtleTests/turtle-subm-17.ttl b/test/TurtleTests/turtle-subm-17.ttl
index 9de0c07b..9de0c07b 100644
--- a/tests/TurtleTests/turtle-subm-17.ttl
+++ b/test/TurtleTests/turtle-subm-17.ttl
diff --git a/tests/TurtleTests/turtle-subm-18.nt b/test/TurtleTests/turtle-subm-18.nt
index fff2da56..fff2da56 100644
--- a/tests/TurtleTests/turtle-subm-18.nt
+++ b/test/TurtleTests/turtle-subm-18.nt
diff --git a/tests/TurtleTests/turtle-subm-18.ttl b/test/TurtleTests/turtle-subm-18.ttl
index 37a9a4f3..37a9a4f3 100644
--- a/tests/TurtleTests/turtle-subm-18.ttl
+++ b/test/TurtleTests/turtle-subm-18.ttl
diff --git a/tests/TurtleTests/turtle-subm-19.nt b/test/TurtleTests/turtle-subm-19.nt
index d5dca690..d5dca690 100644
--- a/tests/TurtleTests/turtle-subm-19.nt
+++ b/test/TurtleTests/turtle-subm-19.nt
diff --git a/tests/TurtleTests/turtle-subm-19.ttl b/test/TurtleTests/turtle-subm-19.ttl
index a8e8dc15..a8e8dc15 100644
--- a/tests/TurtleTests/turtle-subm-19.ttl
+++ b/test/TurtleTests/turtle-subm-19.ttl
diff --git a/tests/TurtleTests/turtle-subm-20.nt b/test/TurtleTests/turtle-subm-20.nt
index 3d0f970e..3d0f970e 100644
--- a/tests/TurtleTests/turtle-subm-20.nt
+++ b/test/TurtleTests/turtle-subm-20.nt
diff --git a/tests/TurtleTests/turtle-subm-20.ttl b/test/TurtleTests/turtle-subm-20.ttl
index 9b1a725a..9b1a725a 100644
--- a/tests/TurtleTests/turtle-subm-20.ttl
+++ b/test/TurtleTests/turtle-subm-20.ttl
diff --git a/tests/TurtleTests/turtle-subm-21.nt b/test/TurtleTests/turtle-subm-21.nt
index fde31312..fde31312 100644
--- a/tests/TurtleTests/turtle-subm-21.nt
+++ b/test/TurtleTests/turtle-subm-21.nt
diff --git a/tests/TurtleTests/turtle-subm-21.ttl b/test/TurtleTests/turtle-subm-21.ttl
index 9f5360af..9f5360af 100644
--- a/tests/TurtleTests/turtle-subm-21.ttl
+++ b/test/TurtleTests/turtle-subm-21.ttl
diff --git a/tests/TurtleTests/turtle-subm-22.nt b/test/TurtleTests/turtle-subm-22.nt
index 5a70bff1..5a70bff1 100644
--- a/tests/TurtleTests/turtle-subm-22.nt
+++ b/test/TurtleTests/turtle-subm-22.nt
diff --git a/tests/TurtleTests/turtle-subm-22.ttl b/test/TurtleTests/turtle-subm-22.ttl
index 25f3b757..25f3b757 100644
--- a/tests/TurtleTests/turtle-subm-22.ttl
+++ b/test/TurtleTests/turtle-subm-22.ttl
diff --git a/tests/TurtleTests/turtle-subm-23.nt b/test/TurtleTests/turtle-subm-23.nt
index 1a38415f..1a38415f 100644
--- a/tests/TurtleTests/turtle-subm-23.nt
+++ b/test/TurtleTests/turtle-subm-23.nt
diff --git a/tests/TurtleTests/turtle-subm-23.ttl b/test/TurtleTests/turtle-subm-23.ttl
index 310349da..310349da 100644
--- a/tests/TurtleTests/turtle-subm-23.ttl
+++ b/test/TurtleTests/turtle-subm-23.ttl
diff --git a/tests/TurtleTests/turtle-subm-24.nt b/test/TurtleTests/turtle-subm-24.nt
index ad105cf4..ad105cf4 100644
--- a/tests/TurtleTests/turtle-subm-24.nt
+++ b/test/TurtleTests/turtle-subm-24.nt
diff --git a/tests/TurtleTests/turtle-subm-24.ttl b/test/TurtleTests/turtle-subm-24.ttl
index 0667c6b4..0667c6b4 100644
--- a/tests/TurtleTests/turtle-subm-24.ttl
+++ b/test/TurtleTests/turtle-subm-24.ttl
diff --git a/tests/TurtleTests/turtle-subm-25.nt b/test/TurtleTests/turtle-subm-25.nt
index 7da0635b..7da0635b 100644
--- a/tests/TurtleTests/turtle-subm-25.nt
+++ b/test/TurtleTests/turtle-subm-25.nt
diff --git a/tests/TurtleTests/turtle-subm-25.ttl b/test/TurtleTests/turtle-subm-25.ttl
index 569023c8..569023c8 100644
--- a/tests/TurtleTests/turtle-subm-25.ttl
+++ b/test/TurtleTests/turtle-subm-25.ttl
diff --git a/tests/TurtleTests/turtle-subm-26.nt b/test/TurtleTests/turtle-subm-26.nt
index 7357dd40..7357dd40 100644
--- a/tests/TurtleTests/turtle-subm-26.nt
+++ b/test/TurtleTests/turtle-subm-26.nt
diff --git a/tests/TurtleTests/turtle-subm-26.ttl b/test/TurtleTests/turtle-subm-26.ttl
index 7357dd40..7357dd40 100644
--- a/tests/TurtleTests/turtle-subm-26.ttl
+++ b/test/TurtleTests/turtle-subm-26.ttl
diff --git a/tests/TurtleTests/turtle-subm-27.nt b/test/TurtleTests/turtle-subm-27.nt
index f9ebfef1..f9ebfef1 100644
--- a/tests/TurtleTests/turtle-subm-27.nt
+++ b/test/TurtleTests/turtle-subm-27.nt
diff --git a/tests/TurtleTests/turtle-subm-27.ttl b/test/TurtleTests/turtle-subm-27.ttl
index ad39c024..ad39c024 100644
--- a/tests/TurtleTests/turtle-subm-27.ttl
+++ b/test/TurtleTests/turtle-subm-27.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-LITERAL2_with_langtag_and_datatype.ttl b/test/TurtleTests/turtle-syntax-bad-LITERAL2_with_langtag_and_datatype.ttl
index 56180417..56180417 100644
--- a/tests/TurtleTests/turtle-syntax-bad-LITERAL2_with_langtag_and_datatype.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-LITERAL2_with_langtag_and_datatype.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-base-01.ttl b/test/TurtleTests/turtle-syntax-bad-base-01.ttl
index 7b0412f8..7b0412f8 100644
--- a/tests/TurtleTests/turtle-syntax-bad-base-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-base-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-base-02.ttl b/test/TurtleTests/turtle-syntax-bad-base-02.ttl
index 8893b652..8893b652 100644
--- a/tests/TurtleTests/turtle-syntax-bad-base-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-base-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-base-03.ttl b/test/TurtleTests/turtle-syntax-bad-base-03.ttl
index 013f9f2b..013f9f2b 100644
--- a/tests/TurtleTests/turtle-syntax-bad-base-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-base-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-blank-label-dot-end.ttl b/test/TurtleTests/turtle-syntax-bad-blank-label-dot-end.ttl
index 58c0aa20..58c0aa20 100644
--- a/tests/TurtleTests/turtle-syntax-bad-blank-label-dot-end.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-blank-label-dot-end.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-esc-01.ttl b/test/TurtleTests/turtle-syntax-bad-esc-01.ttl
index 6daa1b58..6daa1b58 100644
--- a/tests/TurtleTests/turtle-syntax-bad-esc-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-esc-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-esc-02.ttl b/test/TurtleTests/turtle-syntax-bad-esc-02.ttl
index 62457ebf..62457ebf 100644
--- a/tests/TurtleTests/turtle-syntax-bad-esc-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-esc-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-esc-03.ttl b/test/TurtleTests/turtle-syntax-bad-esc-03.ttl
index a9b9f1c0..a9b9f1c0 100644
--- a/tests/TurtleTests/turtle-syntax-bad-esc-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-esc-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-esc-04.ttl b/test/TurtleTests/turtle-syntax-bad-esc-04.ttl
index a9b9f1c0..a9b9f1c0 100644
--- a/tests/TurtleTests/turtle-syntax-bad-esc-04.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-esc-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-kw-01.ttl b/test/TurtleTests/turtle-syntax-bad-kw-01.ttl
index f85448d6..f85448d6 100644
--- a/tests/TurtleTests/turtle-syntax-bad-kw-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-kw-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-kw-02.ttl b/test/TurtleTests/turtle-syntax-bad-kw-02.ttl
index d25986cd..d25986cd 100644
--- a/tests/TurtleTests/turtle-syntax-bad-kw-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-kw-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-kw-03.ttl b/test/TurtleTests/turtle-syntax-bad-kw-03.ttl
index 3d54b929..3d54b929 100644
--- a/tests/TurtleTests/turtle-syntax-bad-kw-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-kw-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-kw-04.ttl b/test/TurtleTests/turtle-syntax-bad-kw-04.ttl
index 229491ed..229491ed 100644
--- a/tests/TurtleTests/turtle-syntax-bad-kw-04.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-kw-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-kw-05.ttl b/test/TurtleTests/turtle-syntax-bad-kw-05.ttl
index c2420af5..c2420af5 100644
--- a/tests/TurtleTests/turtle-syntax-bad-kw-05.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-kw-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-lang-01.ttl b/test/TurtleTests/turtle-syntax-bad-lang-01.ttl
index 80685aae..80685aae 100644
--- a/tests/TurtleTests/turtle-syntax-bad-lang-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-lang-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-ln-dash-start.ttl b/test/TurtleTests/turtle-syntax-bad-ln-dash-start.ttl
index 9af36a1e..9af36a1e 100644
--- a/tests/TurtleTests/turtle-syntax-bad-ln-dash-start.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-ln-dash-start.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-ln-escape-start.ttl b/test/TurtleTests/turtle-syntax-bad-ln-escape-start.ttl
index 9c7a4352..9c7a4352 100644
--- a/tests/TurtleTests/turtle-syntax-bad-ln-escape-start.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-ln-escape-start.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-ln-escape.ttl b/test/TurtleTests/turtle-syntax-bad-ln-escape.ttl
index 212d43a0..212d43a0 100644
--- a/tests/TurtleTests/turtle-syntax-bad-ln-escape.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-ln-escape.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-missing-ns-dot-end.ttl b/test/TurtleTests/turtle-syntax-bad-missing-ns-dot-end.ttl
index d06f4e69..d06f4e69 100644
--- a/tests/TurtleTests/turtle-syntax-bad-missing-ns-dot-end.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-missing-ns-dot-end.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-missing-ns-dot-start.ttl b/test/TurtleTests/turtle-syntax-bad-missing-ns-dot-start.ttl
index 23514bcc..23514bcc 100644
--- a/tests/TurtleTests/turtle-syntax-bad-missing-ns-dot-start.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-missing-ns-dot-start.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-01.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-01.ttl
index f7b19b72..f7b19b72 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-02.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-02.ttl
index e834f15f..e834f15f 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-03.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-03.ttl
index ad5d6ad4..ad5d6ad4 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-04.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-04.ttl
index 895f9ec6..895f9ec6 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-04.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-05.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-05.ttl
index de879b15..de879b15 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-05.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-06.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-06.ttl
index 56610f67..56610f67 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-06.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-06.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-07.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-07.ttl
index 419f7cad..419f7cad 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-07.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-07.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-08.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-08.ttl
index 419f7cad..419f7cad 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-08.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-08.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-09.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-09.ttl
index f093b588..f093b588 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-09.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-09.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-10.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-10.ttl
index 974252f0..974252f0 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-10.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-10.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-11.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-11.ttl
index b74d74a3..b74d74a3 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-11.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-11.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-12.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-12.ttl
index dc2c5b03..dc2c5b03 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-12.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-12.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-n3-extras-13.ttl b/test/TurtleTests/turtle-syntax-bad-n3-extras-13.ttl
index 5f719a24..5f719a24 100644
--- a/tests/TurtleTests/turtle-syntax-bad-n3-extras-13.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-n3-extras-13.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-ns-dot-end.ttl b/test/TurtleTests/turtle-syntax-bad-ns-dot-end.ttl
index fa67031e..fa67031e 100644
--- a/tests/TurtleTests/turtle-syntax-bad-ns-dot-end.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-ns-dot-end.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-ns-dot-start.ttl b/test/TurtleTests/turtle-syntax-bad-ns-dot-start.ttl
index e09d5954..e09d5954 100644
--- a/tests/TurtleTests/turtle-syntax-bad-ns-dot-start.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-ns-dot-start.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-num-01.ttl b/test/TurtleTests/turtle-syntax-bad-num-01.ttl
index cb4730cb..cb4730cb 100644
--- a/tests/TurtleTests/turtle-syntax-bad-num-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-num-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-num-02.ttl b/test/TurtleTests/turtle-syntax-bad-num-02.ttl
index 1c8cbb25..1c8cbb25 100644
--- a/tests/TurtleTests/turtle-syntax-bad-num-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-num-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-num-03.ttl b/test/TurtleTests/turtle-syntax-bad-num-03.ttl
index 7c8fa2cf..7c8fa2cf 100644
--- a/tests/TurtleTests/turtle-syntax-bad-num-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-num-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-num-04.ttl b/test/TurtleTests/turtle-syntax-bad-num-04.ttl
index ad8e0cfd..ad8e0cfd 100644
--- a/tests/TurtleTests/turtle-syntax-bad-num-04.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-num-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-num-05.ttl b/test/TurtleTests/turtle-syntax-bad-num-05.ttl
index 2ee461a0..2ee461a0 100644
--- a/tests/TurtleTests/turtle-syntax-bad-num-05.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-num-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-number-dot-in-anon.ttl b/test/TurtleTests/turtle-syntax-bad-number-dot-in-anon.ttl
index 779cbece..779cbece 100644
--- a/tests/TurtleTests/turtle-syntax-bad-number-dot-in-anon.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-number-dot-in-anon.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-pname-01.ttl b/test/TurtleTests/turtle-syntax-bad-pname-01.ttl
index 5f3098da..5f3098da 100644
--- a/tests/TurtleTests/turtle-syntax-bad-pname-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-pname-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-pname-02.ttl b/test/TurtleTests/turtle-syntax-bad-pname-02.ttl
index fb30823c..fb30823c 100644
--- a/tests/TurtleTests/turtle-syntax-bad-pname-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-pname-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-pname-03.ttl b/test/TurtleTests/turtle-syntax-bad-pname-03.ttl
index b9af59e5..b9af59e5 100644
--- a/tests/TurtleTests/turtle-syntax-bad-pname-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-pname-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-prefix-01.ttl b/test/TurtleTests/turtle-syntax-bad-prefix-01.ttl
index b1b80df1..b1b80df1 100644
--- a/tests/TurtleTests/turtle-syntax-bad-prefix-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-prefix-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-prefix-02.ttl b/test/TurtleTests/turtle-syntax-bad-prefix-02.ttl
index 6e7269f2..6e7269f2 100644
--- a/tests/TurtleTests/turtle-syntax-bad-prefix-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-prefix-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-prefix-03.ttl b/test/TurtleTests/turtle-syntax-bad-prefix-03.ttl
index 1ab01e7b..1ab01e7b 100644
--- a/tests/TurtleTests/turtle-syntax-bad-prefix-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-prefix-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-prefix-04.ttl b/test/TurtleTests/turtle-syntax-bad-prefix-04.ttl
index 5f338f33..5f338f33 100644
--- a/tests/TurtleTests/turtle-syntax-bad-prefix-04.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-prefix-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-prefix-05.ttl b/test/TurtleTests/turtle-syntax-bad-prefix-05.ttl
index efb86c59..efb86c59 100644
--- a/tests/TurtleTests/turtle-syntax-bad-prefix-05.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-prefix-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-string-01.ttl b/test/TurtleTests/turtle-syntax-bad-string-01.ttl
index ef62a6c0..ef62a6c0 100644
--- a/tests/TurtleTests/turtle-syntax-bad-string-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-string-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-string-02.ttl b/test/TurtleTests/turtle-syntax-bad-string-02.ttl
index 2335d529..2335d529 100644
--- a/tests/TurtleTests/turtle-syntax-bad-string-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-string-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-string-03.ttl b/test/TurtleTests/turtle-syntax-bad-string-03.ttl
index 8a9e7ffe..8a9e7ffe 100644
--- a/tests/TurtleTests/turtle-syntax-bad-string-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-string-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-string-04.ttl b/test/TurtleTests/turtle-syntax-bad-string-04.ttl
index 9911defe..9911defe 100644
--- a/tests/TurtleTests/turtle-syntax-bad-string-04.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-string-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-string-05.ttl b/test/TurtleTests/turtle-syntax-bad-string-05.ttl
index f5de7403..f5de7403 100644
--- a/tests/TurtleTests/turtle-syntax-bad-string-05.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-string-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-string-06.ttl b/test/TurtleTests/turtle-syntax-bad-string-06.ttl
index 6bcbc936..6bcbc936 100644
--- a/tests/TurtleTests/turtle-syntax-bad-string-06.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-string-06.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-string-07.ttl b/test/TurtleTests/turtle-syntax-bad-string-07.ttl
index 534614d4..534614d4 100644
--- a/tests/TurtleTests/turtle-syntax-bad-string-07.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-string-07.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-01.ttl b/test/TurtleTests/turtle-syntax-bad-struct-01.ttl
index 7b8b8529..7b8b8529 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-02.ttl b/test/TurtleTests/turtle-syntax-bad-struct-02.ttl
index cb86b9dd..cb86b9dd 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-03.ttl b/test/TurtleTests/turtle-syntax-bad-struct-03.ttl
index 98d9c7ec..98d9c7ec 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-04.ttl b/test/TurtleTests/turtle-syntax-bad-struct-04.ttl
index 40cd7b71..40cd7b71 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-04.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-05.ttl b/test/TurtleTests/turtle-syntax-bad-struct-05.ttl
index e1a3afbc..e1a3afbc 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-05.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-06.ttl b/test/TurtleTests/turtle-syntax-bad-struct-06.ttl
index 2680229a..2680229a 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-06.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-06.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-07.ttl b/test/TurtleTests/turtle-syntax-bad-struct-07.ttl
index 5f74a8b7..5f74a8b7 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-07.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-07.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-08.ttl b/test/TurtleTests/turtle-syntax-bad-struct-08.ttl
index 86aaf4be..86aaf4be 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-08.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-08.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-09.ttl b/test/TurtleTests/turtle-syntax-bad-struct-09.ttl
index 92aae4c2..92aae4c2 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-09.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-09.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-10.ttl b/test/TurtleTests/turtle-syntax-bad-struct-10.ttl
index eb893b24..eb893b24 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-10.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-10.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-11.ttl b/test/TurtleTests/turtle-syntax-bad-struct-11.ttl
index fc6bb993..fc6bb993 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-11.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-11.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-12.ttl b/test/TurtleTests/turtle-syntax-bad-struct-12.ttl
index 1038da86..1038da86 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-12.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-12.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-13.ttl b/test/TurtleTests/turtle-syntax-bad-struct-13.ttl
index 1038da86..1038da86 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-13.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-13.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-14.ttl b/test/TurtleTests/turtle-syntax-bad-struct-14.ttl
index 44db7be2..44db7be2 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-14.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-14.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-15.ttl b/test/TurtleTests/turtle-syntax-bad-struct-15.ttl
index 788cfd67..788cfd67 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-15.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-15.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-16.ttl b/test/TurtleTests/turtle-syntax-bad-struct-16.ttl
index d30a80be..d30a80be 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-16.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-16.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-struct-17.ttl b/test/TurtleTests/turtle-syntax-bad-struct-17.ttl
index 50ea2656..50ea2656 100644
--- a/tests/TurtleTests/turtle-syntax-bad-struct-17.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-struct-17.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-uri-01.ttl b/test/TurtleTests/turtle-syntax-bad-uri-01.ttl
index ebea3f25..ebea3f25 100644
--- a/tests/TurtleTests/turtle-syntax-bad-uri-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-uri-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-uri-02.ttl b/test/TurtleTests/turtle-syntax-bad-uri-02.ttl
index e9096bc7..e9096bc7 100644
--- a/tests/TurtleTests/turtle-syntax-bad-uri-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-uri-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-uri-03.ttl b/test/TurtleTests/turtle-syntax-bad-uri-03.ttl
index 7fe2bf03..7fe2bf03 100644
--- a/tests/TurtleTests/turtle-syntax-bad-uri-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-uri-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-uri-04.ttl b/test/TurtleTests/turtle-syntax-bad-uri-04.ttl
index 258997cb..258997cb 100644
--- a/tests/TurtleTests/turtle-syntax-bad-uri-04.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-uri-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bad-uri-05.ttl b/test/TurtleTests/turtle-syntax-bad-uri-05.ttl
index 542b2b64..542b2b64 100644
--- a/tests/TurtleTests/turtle-syntax-bad-uri-05.ttl
+++ b/test/TurtleTests/turtle-syntax-bad-uri-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-base-01.ttl b/test/TurtleTests/turtle-syntax-base-01.ttl
index 108ceaf5..108ceaf5 100644
--- a/tests/TurtleTests/turtle-syntax-base-01.ttl
+++ b/test/TurtleTests/turtle-syntax-base-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-base-02.ttl b/test/TurtleTests/turtle-syntax-base-02.ttl
index 7a2724f7..7a2724f7 100644
--- a/tests/TurtleTests/turtle-syntax-base-02.ttl
+++ b/test/TurtleTests/turtle-syntax-base-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-base-03.ttl b/test/TurtleTests/turtle-syntax-base-03.ttl
index e90dc14a..e90dc14a 100644
--- a/tests/TurtleTests/turtle-syntax-base-03.ttl
+++ b/test/TurtleTests/turtle-syntax-base-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-base-04.ttl b/test/TurtleTests/turtle-syntax-base-04.ttl
index b0bb4226..b0bb4226 100644
--- a/tests/TurtleTests/turtle-syntax-base-04.ttl
+++ b/test/TurtleTests/turtle-syntax-base-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-blank-label.ttl b/test/TurtleTests/turtle-syntax-blank-label.ttl
index b7fae10d..b7fae10d 100644
--- a/tests/TurtleTests/turtle-syntax-blank-label.ttl
+++ b/test/TurtleTests/turtle-syntax-blank-label.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-01.ttl b/test/TurtleTests/turtle-syntax-bnode-01.ttl
index 274a478c..274a478c 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-01.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-02.ttl b/test/TurtleTests/turtle-syntax-bnode-02.ttl
index 91b9c16e..91b9c16e 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-02.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-03.ttl b/test/TurtleTests/turtle-syntax-bnode-03.ttl
index 36c8450f..36c8450f 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-03.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-04.ttl b/test/TurtleTests/turtle-syntax-bnode-04.ttl
index 942dedd7..942dedd7 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-04.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-05.ttl b/test/TurtleTests/turtle-syntax-bnode-05.ttl
index c2f4169c..c2f4169c 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-05.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-06.ttl b/test/TurtleTests/turtle-syntax-bnode-06.ttl
index f9ffec8c..f9ffec8c 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-06.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-06.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-07.ttl b/test/TurtleTests/turtle-syntax-bnode-07.ttl
index c0dba051..c0dba051 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-07.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-07.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-08.ttl b/test/TurtleTests/turtle-syntax-bnode-08.ttl
index 630843b0..630843b0 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-08.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-08.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-09.ttl b/test/TurtleTests/turtle-syntax-bnode-09.ttl
index cd75e3a3..cd75e3a3 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-09.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-09.ttl
diff --git a/tests/TurtleTests/turtle-syntax-bnode-10.ttl b/test/TurtleTests/turtle-syntax-bnode-10.ttl
index 03fa67ca..03fa67ca 100644
--- a/tests/TurtleTests/turtle-syntax-bnode-10.ttl
+++ b/test/TurtleTests/turtle-syntax-bnode-10.ttl
diff --git a/tests/TurtleTests/turtle-syntax-datatypes-01.ttl b/test/TurtleTests/turtle-syntax-datatypes-01.ttl
index 9e273c51..9e273c51 100644
--- a/tests/TurtleTests/turtle-syntax-datatypes-01.ttl
+++ b/test/TurtleTests/turtle-syntax-datatypes-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-datatypes-02.ttl b/test/TurtleTests/turtle-syntax-datatypes-02.ttl
index 477bd73c..477bd73c 100644
--- a/tests/TurtleTests/turtle-syntax-datatypes-02.ttl
+++ b/test/TurtleTests/turtle-syntax-datatypes-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-file-01.ttl b/test/TurtleTests/turtle-syntax-file-01.ttl
index e69de29b..e69de29b 100644
--- a/tests/TurtleTests/turtle-syntax-file-01.ttl
+++ b/test/TurtleTests/turtle-syntax-file-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-file-02.ttl b/test/TurtleTests/turtle-syntax-file-02.ttl
index e6d327d5..e6d327d5 100644
--- a/tests/TurtleTests/turtle-syntax-file-02.ttl
+++ b/test/TurtleTests/turtle-syntax-file-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-file-03.ttl b/test/TurtleTests/turtle-syntax-file-03.ttl
index a9ca0358..a9ca0358 100644
--- a/tests/TurtleTests/turtle-syntax-file-03.ttl
+++ b/test/TurtleTests/turtle-syntax-file-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-kw-01.ttl b/test/TurtleTests/turtle-syntax-kw-01.ttl
index 854c7568..854c7568 100644
--- a/tests/TurtleTests/turtle-syntax-kw-01.ttl
+++ b/test/TurtleTests/turtle-syntax-kw-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-kw-02.ttl b/test/TurtleTests/turtle-syntax-kw-02.ttl
index c948160b..c948160b 100644
--- a/tests/TurtleTests/turtle-syntax-kw-02.ttl
+++ b/test/TurtleTests/turtle-syntax-kw-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-kw-03.ttl b/test/TurtleTests/turtle-syntax-kw-03.ttl
index bb479bfa..bb479bfa 100644
--- a/tests/TurtleTests/turtle-syntax-kw-03.ttl
+++ b/test/TurtleTests/turtle-syntax-kw-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-lists-01.ttl b/test/TurtleTests/turtle-syntax-lists-01.ttl
index c6ee0fbe..c6ee0fbe 100644
--- a/tests/TurtleTests/turtle-syntax-lists-01.ttl
+++ b/test/TurtleTests/turtle-syntax-lists-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-lists-02.ttl b/test/TurtleTests/turtle-syntax-lists-02.ttl
index 06a0cd1e..06a0cd1e 100644
--- a/tests/TurtleTests/turtle-syntax-lists-02.ttl
+++ b/test/TurtleTests/turtle-syntax-lists-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-lists-03.ttl b/test/TurtleTests/turtle-syntax-lists-03.ttl
index e71f0273..e71f0273 100644
--- a/tests/TurtleTests/turtle-syntax-lists-03.ttl
+++ b/test/TurtleTests/turtle-syntax-lists-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-lists-04.ttl b/test/TurtleTests/turtle-syntax-lists-04.ttl
index a9885389..a9885389 100644
--- a/tests/TurtleTests/turtle-syntax-lists-04.ttl
+++ b/test/TurtleTests/turtle-syntax-lists-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-lists-05.ttl b/test/TurtleTests/turtle-syntax-lists-05.ttl
index 43e68a44..43e68a44 100644
--- a/tests/TurtleTests/turtle-syntax-lists-05.ttl
+++ b/test/TurtleTests/turtle-syntax-lists-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-ln-colons.ttl b/test/TurtleTests/turtle-syntax-ln-colons.ttl
index 80a2e3df..80a2e3df 100644
--- a/tests/TurtleTests/turtle-syntax-ln-colons.ttl
+++ b/test/TurtleTests/turtle-syntax-ln-colons.ttl
diff --git a/tests/TurtleTests/turtle-syntax-ln-dots.ttl b/test/TurtleTests/turtle-syntax-ln-dots.ttl
index ca5bba97..ca5bba97 100644
--- a/tests/TurtleTests/turtle-syntax-ln-dots.ttl
+++ b/test/TurtleTests/turtle-syntax-ln-dots.ttl
diff --git a/tests/TurtleTests/turtle-syntax-ns-dots.ttl b/test/TurtleTests/turtle-syntax-ns-dots.ttl
index 1059b576..1059b576 100644
--- a/tests/TurtleTests/turtle-syntax-ns-dots.ttl
+++ b/test/TurtleTests/turtle-syntax-ns-dots.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-01.ttl b/test/TurtleTests/turtle-syntax-number-01.ttl
index 016fa8f2..016fa8f2 100644
--- a/tests/TurtleTests/turtle-syntax-number-01.ttl
+++ b/test/TurtleTests/turtle-syntax-number-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-02.ttl b/test/TurtleTests/turtle-syntax-number-02.ttl
index 66d1b389..66d1b389 100644
--- a/tests/TurtleTests/turtle-syntax-number-02.ttl
+++ b/test/TurtleTests/turtle-syntax-number-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-03.ttl b/test/TurtleTests/turtle-syntax-number-03.ttl
index 44142857..44142857 100644
--- a/tests/TurtleTests/turtle-syntax-number-03.ttl
+++ b/test/TurtleTests/turtle-syntax-number-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-04.ttl b/test/TurtleTests/turtle-syntax-number-04.ttl
index ab48cbc6..ab48cbc6 100644
--- a/tests/TurtleTests/turtle-syntax-number-04.ttl
+++ b/test/TurtleTests/turtle-syntax-number-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-05.ttl b/test/TurtleTests/turtle-syntax-number-05.ttl
index a8d5845a..a8d5845a 100644
--- a/tests/TurtleTests/turtle-syntax-number-05.ttl
+++ b/test/TurtleTests/turtle-syntax-number-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-06.ttl b/test/TurtleTests/turtle-syntax-number-06.ttl
index cb3a2b06..cb3a2b06 100644
--- a/tests/TurtleTests/turtle-syntax-number-06.ttl
+++ b/test/TurtleTests/turtle-syntax-number-06.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-07.ttl b/test/TurtleTests/turtle-syntax-number-07.ttl
index 8b0050e6..8b0050e6 100644
--- a/tests/TurtleTests/turtle-syntax-number-07.ttl
+++ b/test/TurtleTests/turtle-syntax-number-07.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-08.ttl b/test/TurtleTests/turtle-syntax-number-08.ttl
index 70ddeed3..70ddeed3 100644
--- a/tests/TurtleTests/turtle-syntax-number-08.ttl
+++ b/test/TurtleTests/turtle-syntax-number-08.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-09.ttl b/test/TurtleTests/turtle-syntax-number-09.ttl
index 386b819f..386b819f 100644
--- a/tests/TurtleTests/turtle-syntax-number-09.ttl
+++ b/test/TurtleTests/turtle-syntax-number-09.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-10.ttl b/test/TurtleTests/turtle-syntax-number-10.ttl
index 46875e94..46875e94 100644
--- a/tests/TurtleTests/turtle-syntax-number-10.ttl
+++ b/test/TurtleTests/turtle-syntax-number-10.ttl
diff --git a/tests/TurtleTests/turtle-syntax-number-11.ttl b/test/TurtleTests/turtle-syntax-number-11.ttl
index 1d8c367e..1d8c367e 100644
--- a/tests/TurtleTests/turtle-syntax-number-11.ttl
+++ b/test/TurtleTests/turtle-syntax-number-11.ttl
diff --git a/tests/TurtleTests/turtle-syntax-pname-esc-01.ttl b/test/TurtleTests/turtle-syntax-pname-esc-01.ttl
index 5a3a5fd7..5a3a5fd7 100644
--- a/tests/TurtleTests/turtle-syntax-pname-esc-01.ttl
+++ b/test/TurtleTests/turtle-syntax-pname-esc-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-pname-esc-02.ttl b/test/TurtleTests/turtle-syntax-pname-esc-02.ttl
index 5d806cf4..5d806cf4 100644
--- a/tests/TurtleTests/turtle-syntax-pname-esc-02.ttl
+++ b/test/TurtleTests/turtle-syntax-pname-esc-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-pname-esc-03.ttl b/test/TurtleTests/turtle-syntax-pname-esc-03.ttl
index 9949c52b..9949c52b 100644
--- a/tests/TurtleTests/turtle-syntax-pname-esc-03.ttl
+++ b/test/TurtleTests/turtle-syntax-pname-esc-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-prefix-01.ttl b/test/TurtleTests/turtle-syntax-prefix-01.ttl
index 7fd69327..7fd69327 100644
--- a/tests/TurtleTests/turtle-syntax-prefix-01.ttl
+++ b/test/TurtleTests/turtle-syntax-prefix-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-prefix-02.ttl b/test/TurtleTests/turtle-syntax-prefix-02.ttl
index 99d4ae45..99d4ae45 100644
--- a/tests/TurtleTests/turtle-syntax-prefix-02.ttl
+++ b/test/TurtleTests/turtle-syntax-prefix-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-prefix-03.ttl b/test/TurtleTests/turtle-syntax-prefix-03.ttl
index c834d10f..c834d10f 100644
--- a/tests/TurtleTests/turtle-syntax-prefix-03.ttl
+++ b/test/TurtleTests/turtle-syntax-prefix-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-prefix-04.ttl b/test/TurtleTests/turtle-syntax-prefix-04.ttl
index 4ff94dc0..4ff94dc0 100644
--- a/tests/TurtleTests/turtle-syntax-prefix-04.ttl
+++ b/test/TurtleTests/turtle-syntax-prefix-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-prefix-05.ttl b/test/TurtleTests/turtle-syntax-prefix-05.ttl
index 30441026..30441026 100644
--- a/tests/TurtleTests/turtle-syntax-prefix-05.ttl
+++ b/test/TurtleTests/turtle-syntax-prefix-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-prefix-06.ttl b/test/TurtleTests/turtle-syntax-prefix-06.ttl
index 7044be5a..7044be5a 100644
--- a/tests/TurtleTests/turtle-syntax-prefix-06.ttl
+++ b/test/TurtleTests/turtle-syntax-prefix-06.ttl
diff --git a/tests/TurtleTests/turtle-syntax-prefix-07.ttl b/test/TurtleTests/turtle-syntax-prefix-07.ttl
index 1db61e8a..1db61e8a 100644
--- a/tests/TurtleTests/turtle-syntax-prefix-07.ttl
+++ b/test/TurtleTests/turtle-syntax-prefix-07.ttl
diff --git a/tests/TurtleTests/turtle-syntax-prefix-08.ttl b/test/TurtleTests/turtle-syntax-prefix-08.ttl
index f969a4af..f969a4af 100644
--- a/tests/TurtleTests/turtle-syntax-prefix-08.ttl
+++ b/test/TurtleTests/turtle-syntax-prefix-08.ttl
diff --git a/tests/TurtleTests/turtle-syntax-prefix-09.ttl b/test/TurtleTests/turtle-syntax-prefix-09.ttl
index 5c57ebea..5c57ebea 100644
--- a/tests/TurtleTests/turtle-syntax-prefix-09.ttl
+++ b/test/TurtleTests/turtle-syntax-prefix-09.ttl
diff --git a/tests/TurtleTests/turtle-syntax-str-esc-01.ttl b/test/TurtleTests/turtle-syntax-str-esc-01.ttl
index f11f2827..f11f2827 100644
--- a/tests/TurtleTests/turtle-syntax-str-esc-01.ttl
+++ b/test/TurtleTests/turtle-syntax-str-esc-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-str-esc-02.ttl b/test/TurtleTests/turtle-syntax-str-esc-02.ttl
index 0b77f95a..0b77f95a 100644
--- a/tests/TurtleTests/turtle-syntax-str-esc-02.ttl
+++ b/test/TurtleTests/turtle-syntax-str-esc-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-str-esc-03.ttl b/test/TurtleTests/turtle-syntax-str-esc-03.ttl
index af1e3281..af1e3281 100644
--- a/tests/TurtleTests/turtle-syntax-str-esc-03.ttl
+++ b/test/TurtleTests/turtle-syntax-str-esc-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-01.ttl b/test/TurtleTests/turtle-syntax-string-01.ttl
index 7bf8a6d4..7bf8a6d4 100644
--- a/tests/TurtleTests/turtle-syntax-string-01.ttl
+++ b/test/TurtleTests/turtle-syntax-string-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-02.ttl b/test/TurtleTests/turtle-syntax-string-02.ttl
index 8cb89e98..8cb89e98 100644
--- a/tests/TurtleTests/turtle-syntax-string-02.ttl
+++ b/test/TurtleTests/turtle-syntax-string-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-03.ttl b/test/TurtleTests/turtle-syntax-string-03.ttl
index 312d1d67..312d1d67 100644
--- a/tests/TurtleTests/turtle-syntax-string-03.ttl
+++ b/test/TurtleTests/turtle-syntax-string-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-04.ttl b/test/TurtleTests/turtle-syntax-string-04.ttl
index 3ecdea3a..3ecdea3a 100644
--- a/tests/TurtleTests/turtle-syntax-string-04.ttl
+++ b/test/TurtleTests/turtle-syntax-string-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-05.ttl b/test/TurtleTests/turtle-syntax-string-05.ttl
index f32b6d02..f32b6d02 100644
--- a/tests/TurtleTests/turtle-syntax-string-05.ttl
+++ b/test/TurtleTests/turtle-syntax-string-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-06.ttl b/test/TurtleTests/turtle-syntax-string-06.ttl
index 77399380..77399380 100644
--- a/tests/TurtleTests/turtle-syntax-string-06.ttl
+++ b/test/TurtleTests/turtle-syntax-string-06.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-07.ttl b/test/TurtleTests/turtle-syntax-string-07.ttl
index 6c3e6a44..6c3e6a44 100644
--- a/tests/TurtleTests/turtle-syntax-string-07.ttl
+++ b/test/TurtleTests/turtle-syntax-string-07.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-08.ttl b/test/TurtleTests/turtle-syntax-string-08.ttl
index 2fb0227b..2fb0227b 100644
--- a/tests/TurtleTests/turtle-syntax-string-08.ttl
+++ b/test/TurtleTests/turtle-syntax-string-08.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-09.ttl b/test/TurtleTests/turtle-syntax-string-09.ttl
index 390c8af9..390c8af9 100644
--- a/tests/TurtleTests/turtle-syntax-string-09.ttl
+++ b/test/TurtleTests/turtle-syntax-string-09.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-10.ttl b/test/TurtleTests/turtle-syntax-string-10.ttl
index 5b6e5c35..5b6e5c35 100644
--- a/tests/TurtleTests/turtle-syntax-string-10.ttl
+++ b/test/TurtleTests/turtle-syntax-string-10.ttl
diff --git a/tests/TurtleTests/turtle-syntax-string-11.ttl b/test/TurtleTests/turtle-syntax-string-11.ttl
index 7b78abf1..7b78abf1 100644
--- a/tests/TurtleTests/turtle-syntax-string-11.ttl
+++ b/test/TurtleTests/turtle-syntax-string-11.ttl
diff --git a/tests/TurtleTests/turtle-syntax-struct-01.ttl b/test/TurtleTests/turtle-syntax-struct-01.ttl
index 990e5160..990e5160 100644
--- a/tests/TurtleTests/turtle-syntax-struct-01.ttl
+++ b/test/TurtleTests/turtle-syntax-struct-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-struct-02.ttl b/test/TurtleTests/turtle-syntax-struct-02.ttl
index 0684b2fe..0684b2fe 100644
--- a/tests/TurtleTests/turtle-syntax-struct-02.ttl
+++ b/test/TurtleTests/turtle-syntax-struct-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-struct-03.ttl b/test/TurtleTests/turtle-syntax-struct-03.ttl
index 1e303515..1e303515 100644
--- a/tests/TurtleTests/turtle-syntax-struct-03.ttl
+++ b/test/TurtleTests/turtle-syntax-struct-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-struct-04.ttl b/test/TurtleTests/turtle-syntax-struct-04.ttl
index 3d1bf3b0..3d1bf3b0 100644
--- a/tests/TurtleTests/turtle-syntax-struct-04.ttl
+++ b/test/TurtleTests/turtle-syntax-struct-04.ttl
diff --git a/tests/TurtleTests/turtle-syntax-struct-05.ttl b/test/TurtleTests/turtle-syntax-struct-05.ttl
index c39e0411..c39e0411 100644
--- a/tests/TurtleTests/turtle-syntax-struct-05.ttl
+++ b/test/TurtleTests/turtle-syntax-struct-05.ttl
diff --git a/tests/TurtleTests/turtle-syntax-uri-01.ttl b/test/TurtleTests/turtle-syntax-uri-01.ttl
index 2e2d5baf..2e2d5baf 100644
--- a/tests/TurtleTests/turtle-syntax-uri-01.ttl
+++ b/test/TurtleTests/turtle-syntax-uri-01.ttl
diff --git a/tests/TurtleTests/turtle-syntax-uri-02.ttl b/test/TurtleTests/turtle-syntax-uri-02.ttl
index f355d38c..f355d38c 100644
--- a/tests/TurtleTests/turtle-syntax-uri-02.ttl
+++ b/test/TurtleTests/turtle-syntax-uri-02.ttl
diff --git a/tests/TurtleTests/turtle-syntax-uri-03.ttl b/test/TurtleTests/turtle-syntax-uri-03.ttl
index 0ea581af..0ea581af 100644
--- a/tests/TurtleTests/turtle-syntax-uri-03.ttl
+++ b/test/TurtleTests/turtle-syntax-uri-03.ttl
diff --git a/tests/TurtleTests/turtle-syntax-uri-04.ttl b/test/TurtleTests/turtle-syntax-uri-04.ttl
index db805c8f..db805c8f 100644
--- a/tests/TurtleTests/turtle-syntax-uri-04.ttl
+++ b/test/TurtleTests/turtle-syntax-uri-04.ttl
diff --git a/tests/TurtleTests/two_LITERAL_LONG2s.nt b/test/TurtleTests/two_LITERAL_LONG2s.nt
index af94fe6a..af94fe6a 100644
--- a/tests/TurtleTests/two_LITERAL_LONG2s.nt
+++ b/test/TurtleTests/two_LITERAL_LONG2s.nt
diff --git a/tests/TurtleTests/two_LITERAL_LONG2s.ttl b/test/TurtleTests/two_LITERAL_LONG2s.ttl
index ceaad3d4..ceaad3d4 100644
--- a/tests/TurtleTests/two_LITERAL_LONG2s.ttl
+++ b/test/TurtleTests/two_LITERAL_LONG2s.ttl
diff --git a/tests/TurtleTests/underscore_in_localName.nt b/test/TurtleTests/underscore_in_localName.nt
index f9d0c4f1..f9d0c4f1 100644
--- a/tests/TurtleTests/underscore_in_localName.nt
+++ b/test/TurtleTests/underscore_in_localName.nt
diff --git a/tests/TurtleTests/underscore_in_localName.ttl b/test/TurtleTests/underscore_in_localName.ttl
index 34596fdf..34596fdf 100644
--- a/tests/TurtleTests/underscore_in_localName.ttl
+++ b/test/TurtleTests/underscore_in_localName.ttl
diff --git a/tests/bad/bad-00.ttl b/test/bad/bad-00.ttl
index b1a1b361..b1a1b361 100644
--- a/tests/bad/bad-00.ttl
+++ b/test/bad/bad-00.ttl
diff --git a/tests/bad/bad-01.ttl b/test/bad/bad-01.ttl
index 533bc21d..533bc21d 100644
--- a/tests/bad/bad-01.ttl
+++ b/test/bad/bad-01.ttl
diff --git a/tests/bad/bad-02.ttl b/test/bad/bad-02.ttl
index fd2014d0..fd2014d0 100644
--- a/tests/bad/bad-02.ttl
+++ b/test/bad/bad-02.ttl
diff --git a/tests/bad/bad-03.ttl b/test/bad/bad-03.ttl
index 07a372f1..07a372f1 100644
--- a/tests/bad/bad-03.ttl
+++ b/test/bad/bad-03.ttl
diff --git a/tests/bad/bad-04.ttl b/test/bad/bad-04.ttl
index ee7246c8..ee7246c8 100644
--- a/tests/bad/bad-04.ttl
+++ b/test/bad/bad-04.ttl
diff --git a/tests/bad/bad-05.ttl b/test/bad/bad-05.ttl
index 387015fe..387015fe 100644
--- a/tests/bad/bad-05.ttl
+++ b/test/bad/bad-05.ttl
diff --git a/tests/bad/bad-06.ttl b/test/bad/bad-06.ttl
index a8f1a0fc..a8f1a0fc 100644
--- a/tests/bad/bad-06.ttl
+++ b/test/bad/bad-06.ttl
diff --git a/tests/bad/bad-07.ttl b/test/bad/bad-07.ttl
index 18ea4fa6..18ea4fa6 100644
--- a/tests/bad/bad-07.ttl
+++ b/test/bad/bad-07.ttl
diff --git a/tests/bad/bad-08.ttl b/test/bad/bad-08.ttl
index 07918f9a..07918f9a 100644
--- a/tests/bad/bad-08.ttl
+++ b/test/bad/bad-08.ttl
diff --git a/tests/bad/bad-09.ttl b/test/bad/bad-09.ttl
index d2d76c13..d2d76c13 100644
--- a/tests/bad/bad-09.ttl
+++ b/test/bad/bad-09.ttl
diff --git a/tests/bad/bad-10.ttl b/test/bad/bad-10.ttl
index b5ef1f55..b5ef1f55 100644
--- a/tests/bad/bad-10.ttl
+++ b/test/bad/bad-10.ttl
diff --git a/tests/bad/bad-11.ttl b/test/bad/bad-11.ttl
index 09e7b6a0..09e7b6a0 100644
--- a/tests/bad/bad-11.ttl
+++ b/test/bad/bad-11.ttl
diff --git a/tests/bad/bad-12.ttl b/test/bad/bad-12.ttl
index cef48ff8..cef48ff8 100644
--- a/tests/bad/bad-12.ttl
+++ b/test/bad/bad-12.ttl
diff --git a/tests/bad/bad-13.ttl b/test/bad/bad-13.ttl
index 91accf2b..91accf2b 100644
--- a/tests/bad/bad-13.ttl
+++ b/test/bad/bad-13.ttl
diff --git a/tests/bad/bad-14.ttl b/test/bad/bad-14.ttl
index f4a7acf5..f4a7acf5 100644
--- a/tests/bad/bad-14.ttl
+++ b/test/bad/bad-14.ttl
diff --git a/tests/bad/bad-base.ttl b/test/bad/bad-base.ttl
index 85421999..85421999 100644
--- a/tests/bad/bad-base.ttl
+++ b/test/bad/bad-base.ttl
diff --git a/tests/bad/bad-blank.ttl b/test/bad/bad-blank.ttl
index a6543f2d..a6543f2d 100644
--- a/tests/bad/bad-blank.ttl
+++ b/test/bad/bad-blank.ttl
diff --git a/tests/bad/bad-bom.ttl b/test/bad/bad-bom.ttl
index 67993884..67993884 100644
--- a/tests/bad/bad-bom.ttl
+++ b/test/bad/bad-bom.ttl
diff --git a/tests/bad/bad-char-in-local.ttl b/test/bad/bad-char-in-local.ttl
index 973cc0a2..973cc0a2 100644
--- a/tests/bad/bad-char-in-local.ttl
+++ b/test/bad/bad-char-in-local.ttl
diff --git a/tests/bad/bad-char-in-prefix.ttl b/test/bad/bad-char-in-prefix.ttl
index b54e0274..b54e0274 100644
--- a/tests/bad/bad-char-in-prefix.ttl
+++ b/test/bad/bad-char-in-prefix.ttl
diff --git a/tests/bad/bad-char-in-uri.ttl b/test/bad/bad-char-in-uri.ttl
index 49f9c0d4..49f9c0d4 100644
--- a/tests/bad/bad-char-in-uri.ttl
+++ b/test/bad/bad-char-in-uri.ttl
diff --git a/tests/bad/bad-datatype.ttl b/test/bad/bad-datatype.ttl
index 0dd6018f..0dd6018f 100644
--- a/tests/bad/bad-datatype.ttl
+++ b/test/bad/bad-datatype.ttl
diff --git a/tests/bad/bad-dot-after-subject.ttl b/test/bad/bad-dot-after-subject.ttl
index e76e0ea2..e76e0ea2 100644
--- a/tests/bad/bad-dot-after-subject.ttl
+++ b/test/bad/bad-dot-after-subject.ttl
diff --git a/tests/bad/bad-dot-in-collection.ttl b/test/bad/bad-dot-in-collection.ttl
index d2d35bc2..d2d35bc2 100644
--- a/tests/bad/bad-dot-in-collection.ttl
+++ b/test/bad/bad-dot-in-collection.ttl
diff --git a/tests/bad/bad-eof-after-quotes.ttl b/test/bad/bad-eof-after-quotes.ttl
index 40e429cb..40e429cb 100644
--- a/tests/bad/bad-eof-after-quotes.ttl
+++ b/test/bad/bad-eof-after-quotes.ttl
diff --git a/tests/bad/bad-eof-at-string-start.ttl b/test/bad/bad-eof-at-string-start.ttl
index 93d20bcc..93d20bcc 100644
--- a/tests/bad/bad-eof-at-string-start.ttl
+++ b/test/bad/bad-eof-at-string-start.ttl
diff --git a/tests/bad/bad-eof-in-blank.ttl b/test/bad/bad-eof-in-blank.ttl
index 8cf4ee84..8cf4ee84 100644
--- a/tests/bad/bad-eof-in-blank.ttl
+++ b/test/bad/bad-eof-in-blank.ttl
diff --git a/tests/bad/bad-eof-in-escape.ttl b/test/bad/bad-eof-in-escape.ttl
index 24b4eec6..24b4eec6 100644
--- a/tests/bad/bad-eof-in-escape.ttl
+++ b/test/bad/bad-eof-in-escape.ttl
diff --git a/tests/bad/bad-eof-in-lang-suffix.ttl b/test/bad/bad-eof-in-lang-suffix.ttl
index f46a7763..f46a7763 100644
--- a/tests/bad/bad-eof-in-lang-suffix.ttl
+++ b/test/bad/bad-eof-in-lang-suffix.ttl
diff --git a/tests/bad/bad-eof-in-lang.ttl b/test/bad/bad-eof-in-lang.ttl
index bfdffd02..bfdffd02 100644
--- a/tests/bad/bad-eof-in-lang.ttl
+++ b/test/bad/bad-eof-in-lang.ttl
diff --git a/tests/bad/bad-eof-in-list.ttl b/test/bad/bad-eof-in-list.ttl
index 13eeb88d..13eeb88d 100644
--- a/tests/bad/bad-eof-in-list.ttl
+++ b/test/bad/bad-eof-in-list.ttl
diff --git a/tests/bad/bad-eof-in-long-string.ttl b/test/bad/bad-eof-in-long-string.ttl
index 2ef179a8..2ef179a8 100644
--- a/tests/bad/bad-eof-in-long-string.ttl
+++ b/test/bad/bad-eof-in-long-string.ttl
diff --git a/tests/bad/bad-eof-in-object-list.ttl b/test/bad/bad-eof-in-object-list.ttl
index 9bbcd17a..9bbcd17a 100644
--- a/tests/bad/bad-eof-in-object-list.ttl
+++ b/test/bad/bad-eof-in-object-list.ttl
diff --git a/tests/bad/bad-eof-in-object-list2.ttl b/test/bad/bad-eof-in-object-list2.ttl
index 9186fb9f..9186fb9f 100644
--- a/tests/bad/bad-eof-in-object-list2.ttl
+++ b/test/bad/bad-eof-in-object-list2.ttl
diff --git a/tests/bad/bad-eof-in-predicate-list.ttl b/test/bad/bad-eof-in-predicate-list.ttl
index eab5b05b..eab5b05b 100644
--- a/tests/bad/bad-eof-in-predicate-list.ttl
+++ b/test/bad/bad-eof-in-predicate-list.ttl
diff --git a/tests/bad/bad-eof-in-string.ttl b/test/bad/bad-eof-in-string.ttl
index bb6e817f..bb6e817f 100644
--- a/tests/bad/bad-eof-in-string.ttl
+++ b/test/bad/bad-eof-in-string.ttl
diff --git a/tests/bad/bad-eof-in-triple-quote.ttl b/test/bad/bad-eof-in-triple-quote.ttl
index fb935441..fb935441 100644
--- a/tests/bad/bad-eof-in-triple-quote.ttl
+++ b/test/bad/bad-eof-in-triple-quote.ttl
diff --git a/tests/bad/bad-eof-in-uri-scheme.nt b/test/bad/bad-eof-in-uri-scheme.nt
index de892dcf..de892dcf 100644
--- a/tests/bad/bad-eof-in-uri-scheme.nt
+++ b/test/bad/bad-eof-in-uri-scheme.nt
diff --git a/tests/bad/bad-eof-in-uri.ttl b/test/bad/bad-eof-in-uri.ttl
index 07b6e6ab..07b6e6ab 100644
--- a/tests/bad/bad-eof-in-uri.ttl
+++ b/test/bad/bad-eof-in-uri.ttl
diff --git a/tests/bad/bad-escape.ttl b/test/bad/bad-escape.ttl
index c03f395f..c03f395f 100644
--- a/tests/bad/bad-escape.ttl
+++ b/test/bad/bad-escape.ttl
diff --git a/tests/bad/bad-ext-namedblank-op.ttl b/test/bad/bad-ext-namedblank-op.ttl
index 5e648393..5e648393 100644
--- a/tests/bad/bad-ext-namedblank-op.ttl
+++ b/test/bad/bad-ext-namedblank-op.ttl
diff --git a/tests/bad/bad-graph-blank-label.trig b/test/bad/bad-graph-blank-label.trig
index 8b329db3..8b329db3 100644
--- a/tests/bad/bad-graph-blank-label.trig
+++ b/test/bad/bad-graph-blank-label.trig
diff --git a/tests/bad/bad-hex-digit.ttl b/test/bad/bad-hex-digit.ttl
index 85816ced..85816ced 100644
--- a/tests/bad/bad-hex-digit.ttl
+++ b/test/bad/bad-hex-digit.ttl
diff --git a/tests/bad/bad-id-clash.ttl b/test/bad/bad-id-clash.ttl
index c1536840..c1536840 100644
--- a/tests/bad/bad-id-clash.ttl
+++ b/test/bad/bad-id-clash.ttl
diff --git a/tests/bad/bad-lang.ttl b/test/bad/bad-lang.ttl
index 01e04328..01e04328 100644
--- a/tests/bad/bad-lang.ttl
+++ b/test/bad/bad-lang.ttl
diff --git a/tests/bad/bad-list.ttl b/test/bad/bad-list.ttl
index 5606658e..5606658e 100644
--- a/tests/bad/bad-list.ttl
+++ b/test/bad/bad-list.ttl
diff --git a/tests/bad/bad-list2.ttl b/test/bad/bad-list2.ttl
index 18584209..18584209 100644
--- a/tests/bad/bad-list2.ttl
+++ b/test/bad/bad-list2.ttl
diff --git a/tests/bad/bad-long-literal-in-list.ttl b/test/bad/bad-long-literal-in-list.ttl
index f10b4c3d..f10b4c3d 100644
--- a/tests/bad/bad-long-literal-in-list.ttl
+++ b/test/bad/bad-long-literal-in-list.ttl
diff --git a/tests/bad/bad-missing-semi.ttl b/test/bad/bad-missing-semi.ttl
index f8838805..f8838805 100644
--- a/tests/bad/bad-missing-semi.ttl
+++ b/test/bad/bad-missing-semi.ttl
diff --git a/tests/bad/bad-missing-uri-scheme.nt b/test/bad/bad-missing-uri-scheme.nt
index 5d7bc724..5d7bc724 100644
--- a/tests/bad/bad-missing-uri-scheme.nt
+++ b/test/bad/bad-missing-uri-scheme.nt
diff --git a/tests/bad/bad-misspelled-base.ttl b/test/bad/bad-misspelled-base.ttl
index c8ae227a..c8ae227a 100644
--- a/tests/bad/bad-misspelled-base.ttl
+++ b/test/bad/bad-misspelled-base.ttl
diff --git a/tests/bad/bad-misspelled-prefix.ttl b/test/bad/bad-misspelled-prefix.ttl
index 8c9d57f6..8c9d57f6 100644
--- a/tests/bad/bad-misspelled-prefix.ttl
+++ b/test/bad/bad-misspelled-prefix.ttl
diff --git a/tests/bad/bad-namespace.ttl b/test/bad/bad-namespace.ttl
index 0dd78d33..0dd78d33 100644
--- a/tests/bad/bad-namespace.ttl
+++ b/test/bad/bad-namespace.ttl
diff --git a/tests/bad/bad-ns.ttl b/test/bad/bad-ns.ttl
index 4410573e..4410573e 100644
--- a/tests/bad/bad-ns.ttl
+++ b/test/bad/bad-ns.ttl
diff --git a/tests/bad/bad-null-byte.ttl b/test/bad/bad-null-byte.ttl
index 4f2cb404..4f2cb404 100644
--- a/tests/bad/bad-null-byte.ttl
+++ b/test/bad/bad-null-byte.ttl
diff --git a/tests/bad/bad-num.ttl b/test/bad/bad-num.ttl
index 7685f0e0..7685f0e0 100644
--- a/tests/bad/bad-num.ttl
+++ b/test/bad/bad-num.ttl
diff --git a/tests/bad/bad-object.ttl b/test/bad/bad-object.ttl
index 9fc6da18..9fc6da18 100644
--- a/tests/bad/bad-object.ttl
+++ b/test/bad/bad-object.ttl
diff --git a/tests/bad/bad-object2.ttl b/test/bad/bad-object2.ttl
index 9293d168..9293d168 100644
--- a/tests/bad/bad-object2.ttl
+++ b/test/bad/bad-object2.ttl
diff --git a/tests/bad/bad-pn-escape.ttl b/test/bad/bad-pn-escape.ttl
index 2b363e89..2b363e89 100644
--- a/tests/bad/bad-pn-escape.ttl
+++ b/test/bad/bad-pn-escape.ttl
diff --git a/tests/bad/bad-prefix.ttl b/test/bad/bad-prefix.ttl
index 6c286355..6c286355 100644
--- a/tests/bad/bad-prefix.ttl
+++ b/test/bad/bad-prefix.ttl
diff --git a/tests/bad/bad-semicolon-after-subject.ttl b/test/bad/bad-semicolon-after-subject.ttl
index 582c6ea0..582c6ea0 100644
--- a/tests/bad/bad-semicolon-after-subject.ttl
+++ b/test/bad/bad-semicolon-after-subject.ttl
diff --git a/tests/bad/bad-string.ttl b/test/bad/bad-string.ttl
index 0bdea42c..0bdea42c 100644
--- a/tests/bad/bad-string.ttl
+++ b/test/bad/bad-string.ttl
diff --git a/tests/bad/bad-subject.ttl b/test/bad/bad-subject.ttl
index b98ea39b..b98ea39b 100644
--- a/tests/bad/bad-subject.ttl
+++ b/test/bad/bad-subject.ttl
diff --git a/tests/bad/bad-uri-escape.ttl b/test/bad/bad-uri-escape.ttl
index 16c63754..16c63754 100644
--- a/tests/bad/bad-uri-escape.ttl
+++ b/test/bad/bad-uri-escape.ttl
diff --git a/tests/bad/bad-uri-scheme-start.nt b/test/bad/bad-uri-scheme-start.nt
index cd3fd70f..cd3fd70f 100644
--- a/tests/bad/bad-uri-scheme-start.nt
+++ b/test/bad/bad-uri-scheme-start.nt
diff --git a/tests/bad/bad-uri-scheme.nt b/test/bad/bad-uri-scheme.nt
index 1329edcd..1329edcd 100644
--- a/tests/bad/bad-uri-scheme.nt
+++ b/test/bad/bad-uri-scheme.nt
diff --git a/tests/bad/bad-uri-truncated.nt b/test/bad/bad-uri-truncated.nt
index 22d29e4b..22d29e4b 100644
--- a/tests/bad/bad-uri-truncated.nt
+++ b/test/bad/bad-uri-truncated.nt
diff --git a/tests/bad/bad-verb.ttl b/test/bad/bad-verb.ttl
index 56a134f3..56a134f3 100644
--- a/tests/bad/bad-verb.ttl
+++ b/test/bad/bad-verb.ttl
diff --git a/tests/bad/invalid-char-in-local.ttl b/test/bad/invalid-char-in-local.ttl
index 520c2404..520c2404 100644
--- a/tests/bad/invalid-char-in-local.ttl
+++ b/test/bad/invalid-char-in-local.ttl
diff --git a/tests/bad/invalid-char-in-prefix.ttl b/test/bad/invalid-char-in-prefix.ttl
index 79547803..79547803 100644
--- a/tests/bad/invalid-char-in-prefix.ttl
+++ b/test/bad/invalid-char-in-prefix.ttl
diff --git a/tests/bad/manifest.ttl b/test/bad/manifest.ttl
index e8ecb396..e8ecb396 100644
--- a/tests/bad/manifest.ttl
+++ b/test/bad/manifest.ttl
diff --git a/tests/env_test.c b/test/env_test.c
index 1ed7552e..1ed7552e 100644
--- a/tests/env_test.c
+++ b/test/env_test.c
diff --git a/tests/free_null_test.c b/test/free_null_test.c
index 121a66cd..121a66cd 100644
--- a/tests/free_null_test.c
+++ b/test/free_null_test.c
diff --git a/tests/good/README.txt b/test/good/README.txt
index 37460e60..37460e60 100644
--- a/tests/good/README.txt
+++ b/test/good/README.txt
diff --git a/test/good/UTF-8.nt b/test/good/UTF-8.nt
new file mode 100644
index 00000000..88ed2581
--- /dev/null
+++ b/test/good/UTF-8.nt
@@ -0,0 +1,2 @@
+<http://drobilla.net/sw/serd/test/good/UTF-8.ttl> <http://www.w3.org/2000/01/rdf-schema#comment> "\nUTF-8 encoded sample plain-text file\n\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\n\nMarkus Kuhn [\u02C8ma\u02B3k\u028As ku\u02D0n] <http://www.cl.cam.ac.uk/~mgk25/> \u2014 2002-07-25\n\n\nThe ASCII compatible UTF-8 encoding used in this plain-text file\nis defined in Unicode, ISO 10646-1, and RFC 2279.\n\n\nUsing Unicode/UTF-8, you can write in emails and source code things such as\n\nMathematics and sciences:\n\n  \u222E E\u22C5da = Q,  n \u2192 \u221E, \u2211 f(i) = \u220F g(i),      \u23A7\u23A1\u239B\u250C\u2500\u2500\u2500\u2500\u2500\u2510\u239E\u23A4\u23AB\n                                            \u23AA\u23A2\u239C\u2502a\u00B2+b\u00B3 \u239F\u23A5\u23AA\n  \u2200x\u2208\u211D: \u2308x\u2309 = \u2212\u230A\u2212x\u230B, \u03B1 \u2227 \u00AC\u03B2 = \u00AC(\u00AC\u03B1 \u2228 \u03B2),    \u23AA\u23A2\u239C\u2502\u2500\u2500\u2500\u2500\u2500 \u239F\u23A5\u23AA\n                                            \u23AA\u23A2\u239C\u23B7 c\u2088   \u239F\u23A5\u23AA\n  \u2115 \u2286 \u2115\u2080 \u2282 \u2124 \u2282 \u211A \u2282 \u211D \u2282 \u2102,                   \u23A8\u23A2\u239C       \u239F\u23A5\u23AC\n                                            \u23AA\u23A2\u239C \u221E     \u239F\u23A5\u23AA\n  \u22A5 < a \u2260 b \u2261 c \u2264 d \u226A \u22A4 \u21D2 (\u27E6A\u27E7 \u21D4 \u27EAB\u27EB),      \u23AA\u23A2\u239C \u23B2     \u239F\u23A5\u23AA\n                                            \u23AA\u23A2\u239C \u23B3a\u2071-b\u2071\u239F\u23A5\u23AA\n  2H\u2082 + O\u2082 \u21CC 2H\u2082O, R = 4.7 k\u03A9, \u2300 200 mm     \u23A9\u23A3\u239Di=1    \u23A0\u23A6\u23AD\n\nLinguistics and dictionaries:\n\n  \u00F0i \u0131nt\u0259\u02C8n\u00E6\u0283\u0259n\u0259l f\u0259\u02C8n\u025Bt\u0131k \u0259so\u028Asi\u02C8e\u0131\u0283n\n  Y [\u02C8\u028Fpsil\u0254n], Yen [j\u025Bn], Yoga [\u02C8jo\u02D0g\u0251]\n\nAPL:\n\n  ((V\u2373V)=\u2373\u2374V)/V\u2190,V    \u2337\u2190\u2373\u2192\u2374\u2206\u2207\u2283\u203E\u234E\u2355\u2308\n\nNicer typography in plain text files:\n\n  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557\n  \u2551                                          \u2551\n  \u2551   \u2022 \u2018single\u2019 and \u201Cdouble\u201D quotes         \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 Curly apostrophes: \u201CWe\u2019ve been here\u201D \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 Latin-1 apostrophe and accents: '\u00B4`  \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 \u201Adeutsche\u2018 \u201EAnf\u00FChrungszeichen\u201C       \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 \u2020, \u2021, \u2030, \u2022, 3\u20134, \u2014, \u22125/+5, \u2122, \u2026      \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 ASCII safety test: 1lI|, 0OD, 8B     \u2551\n  \u2551                      \u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E         \u2551\n  \u2551   \u2022 the euro symbol: \u2502 14.95 \u20AC \u2502         \u2551\n  \u2551                      \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F         \u2551\n  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D\n\nCombining characters:\n\n  STARG\u039B\u030ATE SG-1, a = v\u0307 = r\u0308, a\u20D1 \u22A5 b\u20D1\n\nGreek (in Polytonic):\n\n  The Greek anthem:\n\n  \u03A3\u1F72 \u03B3\u03BD\u03C9\u03C1\u1F77\u03B6\u03C9 \u1F00\u03C0\u1F78 \u03C4\u1F74\u03BD \u03BA\u1F79\u03C8\u03B7\n  \u03C4\u03BF\u1FE6 \u03C3\u03C0\u03B1\u03B8\u03B9\u03BF\u1FE6 \u03C4\u1F74\u03BD \u03C4\u03C1\u03BF\u03BC\u03B5\u03C1\u1F75,\n  \u03C3\u1F72 \u03B3\u03BD\u03C9\u03C1\u1F77\u03B6\u03C9 \u1F00\u03C0\u1F78 \u03C4\u1F74\u03BD \u1F44\u03C8\u03B7\n  \u03C0\u03BF\u1F7A \u03BC\u1F72 \u03B2\u1F77\u03B1 \u03BC\u03B5\u03C4\u03C1\u1F71\u03B5\u03B9 \u03C4\u1F74 \u03B3\u1FC6.\n\n  \u1FBF\u0391\u03C0\u1FBF \u03C4\u1F70 \u03BA\u1F79\u03BA\u03BA\u03B1\u03BB\u03B1 \u03B2\u03B3\u03B1\u03BB\u03BC\u1F73\u03BD\u03B7\n  \u03C4\u1FF6\u03BD \u1FFE\u0395\u03BB\u03BB\u1F75\u03BD\u03C9\u03BD \u03C4\u1F70 \u1F31\u03B5\u03C1\u1F71\n  \u03BA\u03B1\u1F76 \u03C3\u1F70\u03BD \u03C0\u03C1\u1FF6\u03C4\u03B1 \u1F00\u03BD\u03B4\u03C1\u03B5\u03B9\u03C9\u03BC\u1F73\u03BD\u03B7\n  \u03C7\u03B1\u1FD6\u03C1\u03B5, \u1F66 \u03C7\u03B1\u1FD6\u03C1\u03B5, \u1FBF\u0395\u03BB\u03B5\u03C5\u03B8\u03B5\u03C1\u03B9\u1F71!\n\n  From a speech of Demosthenes in the 4th century BC:\n\n  \u039F\u1F50\u03C7\u1F76 \u03C4\u03B1\u1F50\u03C4\u1F70 \u03C0\u03B1\u03C1\u1F77\u03C3\u03C4\u03B1\u03C4\u03B1\u1F77 \u03BC\u03BF\u03B9 \u03B3\u03B9\u03B3\u03BD\u1F7D\u03C3\u03BA\u03B5\u03B9\u03BD, \u1F66 \u1F04\u03BD\u03B4\u03C1\u03B5\u03C2 \u1FBF\u0391\u03B8\u03B7\u03BD\u03B1\u1FD6\u03BF\u03B9,\n  \u1F45\u03C4\u03B1\u03BD \u03C4\u1FBF \u03B5\u1F30\u03C2 \u03C4\u1F70 \u03C0\u03C1\u1F71\u03B3\u03BC\u03B1\u03C4\u03B1 \u1F00\u03C0\u03BF\u03B2\u03BB\u1F73\u03C8\u03C9 \u03BA\u03B1\u1F76 \u1F45\u03C4\u03B1\u03BD \u03C0\u03C1\u1F78\u03C2 \u03C4\u03BF\u1F7A\u03C2\n  \u03BB\u1F79\u03B3\u03BF\u03C5\u03C2 \u03BF\u1F53\u03C2 \u1F00\u03BA\u03BF\u1F7B\u03C9\u0387 \u03C4\u03BF\u1F7A\u03C2 \u03BC\u1F72\u03BD \u03B3\u1F70\u03C1 \u03BB\u1F79\u03B3\u03BF\u03C5\u03C2 \u03C0\u03B5\u03C1\u1F76 \u03C4\u03BF\u1FE6\n  \u03C4\u03B9\u03BC\u03C9\u03C1\u1F75\u03C3\u03B1\u03C3\u03B8\u03B1\u03B9 \u03A6\u1F77\u03BB\u03B9\u03C0\u03C0\u03BF\u03BD \u1F41\u03C1\u1FF6 \u03B3\u03B9\u03B3\u03BD\u03BF\u03BC\u1F73\u03BD\u03BF\u03C5\u03C2, \u03C4\u1F70 \u03B4\u1F72 \u03C0\u03C1\u1F71\u03B3\u03BC\u03B1\u03C4\u1FBF\n  \u03B5\u1F30\u03C2 \u03C4\u03BF\u1FE6\u03C4\u03BF \u03C0\u03C1\u03BF\u1F75\u03BA\u03BF\u03BD\u03C4\u03B1,  \u1F65\u03C3\u03B8\u1FBF \u1F45\u03C0\u03C9\u03C2 \u03BC\u1F74 \u03C0\u03B5\u03B9\u03C3\u1F79\u03BC\u03B5\u03B8\u1FBF \u03B1\u1F50\u03C4\u03BF\u1F76\n  \u03C0\u03C1\u1F79\u03C4\u03B5\u03C1\u03BF\u03BD \u03BA\u03B1\u03BA\u1FF6\u03C2 \u03C3\u03BA\u1F73\u03C8\u03B1\u03C3\u03B8\u03B1\u03B9 \u03B4\u1F73\u03BF\u03BD. \u03BF\u1F50\u03B4\u1F73\u03BD \u03BF\u1F56\u03BD \u1F04\u03BB\u03BB\u03BF \u03BC\u03BF\u03B9 \u03B4\u03BF\u03BA\u03BF\u1FE6\u03C3\u03B9\u03BD\n  \u03BF\u1F31 \u03C4\u1F70 \u03C4\u03BF\u03B9\u03B1\u1FE6\u03C4\u03B1 \u03BB\u1F73\u03B3\u03BF\u03BD\u03C4\u03B5\u03C2 \u1F22 \u03C4\u1F74\u03BD \u1F51\u03C0\u1F79\u03B8\u03B5\u03C3\u03B9\u03BD, \u03C0\u03B5\u03C1\u1F76 \u1F27\u03C2 \u03B2\u03BF\u03C5\u03BB\u03B5\u1F7B\u03B5\u03C3\u03B8\u03B1\u03B9,\n  \u03BF\u1F50\u03C7\u1F76 \u03C4\u1F74\u03BD \u03BF\u1F56\u03C3\u03B1\u03BD \u03C0\u03B1\u03C1\u03B9\u03C3\u03C4\u1F71\u03BD\u03C4\u03B5\u03C2 \u1F51\u03BC\u1FD6\u03BD \u1F01\u03BC\u03B1\u03C1\u03C4\u1F71\u03BD\u03B5\u03B9\u03BD. \u1F10\u03B3\u1F7C \u03B4\u1F73, \u1F45\u03C4\u03B9 \u03BC\u1F73\u03BD\n  \u03C0\u03BF\u03C4\u1FBF \u1F10\u03BE\u1FC6\u03BD \u03C4\u1FC7 \u03C0\u1F79\u03BB\u03B5\u03B9 \u03BA\u03B1\u1F76 \u03C4\u1F70 \u03B1\u1F51\u03C4\u1FC6\u03C2 \u1F14\u03C7\u03B5\u03B9\u03BD \u1F00\u03C3\u03C6\u03B1\u03BB\u1FF6\u03C2 \u03BA\u03B1\u1F76 \u03A6\u1F77\u03BB\u03B9\u03C0\u03C0\u03BF\u03BD\n  \u03C4\u03B9\u03BC\u03C9\u03C1\u1F75\u03C3\u03B1\u03C3\u03B8\u03B1\u03B9, \u03BA\u03B1\u1F76 \u03BC\u1F71\u03BB\u1FBF \u1F00\u03BA\u03C1\u03B9\u03B2\u1FF6\u03C2 \u03BF\u1F36\u03B4\u03B1\u0387 \u1F10\u03C0\u1FBF \u1F10\u03BC\u03BF\u1FE6 \u03B3\u1F71\u03C1, \u03BF\u1F50 \u03C0\u1F71\u03BB\u03B1\u03B9\n  \u03B3\u1F73\u03B3\u03BF\u03BD\u03B5\u03BD \u03C4\u03B1\u1FE6\u03C4\u1FBF \u1F00\u03BC\u03C6\u1F79\u03C4\u03B5\u03C1\u03B1\u0387 \u03BD\u1FE6\u03BD \u03BC\u1F73\u03BD\u03C4\u03BF\u03B9 \u03C0\u1F73\u03C0\u03B5\u03B9\u03C3\u03BC\u03B1\u03B9 \u03C4\u03BF\u1FE6\u03B8\u1FBF \u1F31\u03BA\u03B1\u03BD\u1F78\u03BD\n  \u03C0\u03C1\u03BF\u03BB\u03B1\u03B2\u03B5\u1FD6\u03BD \u1F21\u03BC\u1FD6\u03BD \u03B5\u1F36\u03BD\u03B1\u03B9 \u03C4\u1F74\u03BD \u03C0\u03C1\u1F7D\u03C4\u03B7\u03BD, \u1F45\u03C0\u03C9\u03C2 \u03C4\u03BF\u1F7A\u03C2 \u03C3\u03C5\u03BC\u03BC\u1F71\u03C7\u03BF\u03C5\u03C2\n  \u03C3\u1F7D\u03C3\u03BF\u03BC\u03B5\u03BD. \u1F10\u1F70\u03BD \u03B3\u1F70\u03C1 \u03C4\u03BF\u1FE6\u03C4\u03BF \u03B2\u03B5\u03B2\u03B1\u1F77\u03C9\u03C2 \u1F51\u03C0\u1F71\u03C1\u03BE\u1FC3, \u03C4\u1F79\u03C4\u03B5 \u03BA\u03B1\u1F76 \u03C0\u03B5\u03C1\u1F76 \u03C4\u03BF\u1FE6\n  \u03C4\u1F77\u03BD\u03B1 \u03C4\u03B9\u03BC\u03C9\u03C1\u1F75\u03C3\u03B5\u03C4\u03B1\u1F77 \u03C4\u03B9\u03C2 \u03BA\u03B1\u1F76 \u1F43\u03BD \u03C4\u03C1\u1F79\u03C0\u03BF\u03BD \u1F10\u03BE\u1F73\u03C3\u03C4\u03B1\u03B9 \u03C3\u03BA\u03BF\u03C0\u03B5\u1FD6\u03BD\u0387 \u03C0\u03C1\u1F76\u03BD \u03B4\u1F72\n  \u03C4\u1F74\u03BD \u1F00\u03C1\u03C7\u1F74\u03BD \u1F40\u03C1\u03B8\u1FF6\u03C2 \u1F51\u03C0\u03BF\u03B8\u1F73\u03C3\u03B8\u03B1\u03B9, \u03BC\u1F71\u03C4\u03B1\u03B9\u03BF\u03BD \u1F21\u03B3\u03BF\u1FE6\u03BC\u03B1\u03B9 \u03C0\u03B5\u03C1\u1F76 \u03C4\u1FC6\u03C2\n  \u03C4\u03B5\u03BB\u03B5\u03C5\u03C4\u1FC6\u03C2 \u1F41\u03BD\u03C4\u03B9\u03BD\u03BF\u1FE6\u03BD \u03C0\u03BF\u03B9\u03B5\u1FD6\u03C3\u03B8\u03B1\u03B9 \u03BB\u1F79\u03B3\u03BF\u03BD.\n\n  \u0394\u03B7\u03BC\u03BF\u03C3\u03B8\u1F73\u03BD\u03BF\u03C5\u03C2, \u0393\u1FFD \u1FBF\u039F\u03BB\u03C5\u03BD\u03B8\u03B9\u03B1\u03BA\u1F78\u03C2\n\nGeorgian:\n\n  From a Unicode conference invitation:\n\n  \u10D2\u10D7\u10EE\u10DD\u10D5\u10D7 \u10D0\u10EE\u10DA\u10D0\u10D5\u10D4 \u10D2\u10D0\u10D8\u10D0\u10E0\u10DD\u10D7 \u10E0\u10D4\u10D2\u10D8\u10E1\u10E2\u10E0\u10D0\u10EA\u10D8\u10D0 Unicode-\u10D8\u10E1 \u10DB\u10D4\u10D0\u10D7\u10D4 \u10E1\u10D0\u10D4\u10E0\u10D7\u10D0\u10E8\u10DD\u10E0\u10D8\u10E1\u10DD\n  \u10D9\u10DD\u10DC\u10E4\u10D4\u10E0\u10D4\u10DC\u10EA\u10D8\u10D0\u10D6\u10D4 \u10D3\u10D0\u10E1\u10D0\u10E1\u10EC\u10E0\u10D4\u10D1\u10D0\u10D3, \u10E0\u10DD\u10DB\u10D4\u10DA\u10D8\u10EA \u10D2\u10D0\u10D8\u10DB\u10D0\u10E0\u10D7\u10D4\u10D1\u10D0 10-12 \u10DB\u10D0\u10E0\u10E2\u10E1,\n  \u10E5. \u10DB\u10D0\u10D8\u10DC\u10EA\u10E8\u10D8, \u10D2\u10D4\u10E0\u10DB\u10D0\u10DC\u10D8\u10D0\u10E8\u10D8. \u10D9\u10DD\u10DC\u10E4\u10D4\u10E0\u10D4\u10DC\u10EA\u10D8\u10D0 \u10E8\u10D4\u10F0\u10D9\u10E0\u10D4\u10D1\u10E1 \u10D4\u10E0\u10D7\u10D0\u10D3 \u10DB\u10E1\u10DD\u10E4\u10DA\u10D8\u10DD\u10E1\n  \u10D4\u10E5\u10E1\u10DE\u10D4\u10E0\u10E2\u10D4\u10D1\u10E1 \u10D8\u10E1\u10D4\u10D7 \u10D3\u10D0\u10E0\u10D2\u10D4\u10D1\u10E8\u10D8 \u10E0\u10DD\u10D2\u10DD\u10E0\u10D8\u10EA\u10D0\u10D0 \u10D8\u10DC\u10E2\u10D4\u10E0\u10DC\u10D4\u10E2\u10D8 \u10D3\u10D0 Unicode-\u10D8,\n  \u10D8\u10DC\u10E2\u10D4\u10E0\u10DC\u10D0\u10EA\u10D8\u10DD\u10DC\u10D0\u10DA\u10D8\u10D6\u10D0\u10EA\u10D8\u10D0 \u10D3\u10D0 \u10DA\u10DD\u10D9\u10D0\u10DA\u10D8\u10D6\u10D0\u10EA\u10D8\u10D0, Unicode-\u10D8\u10E1 \u10D2\u10D0\u10DB\u10DD\u10E7\u10D4\u10DC\u10D4\u10D1\u10D0\n  \u10DD\u10DE\u10D4\u10E0\u10D0\u10EA\u10D8\u10E3\u10DA \u10E1\u10D8\u10E1\u10E2\u10D4\u10DB\u10D4\u10D1\u10E1\u10D0, \u10D3\u10D0 \u10D2\u10D0\u10DB\u10DD\u10E7\u10D4\u10DC\u10D4\u10D1\u10D8\u10D7 \u10DE\u10E0\u10DD\u10D2\u10E0\u10D0\u10DB\u10D4\u10D1\u10E8\u10D8, \u10E8\u10E0\u10D8\u10E4\u10E2\u10D4\u10D1\u10E8\u10D8,\n  \u10E2\u10D4\u10E5\u10E1\u10E2\u10D4\u10D1\u10D8\u10E1 \u10D3\u10D0\u10DB\u10E3\u10E8\u10D0\u10D5\u10D4\u10D1\u10D0\u10E1\u10D0 \u10D3\u10D0 \u10DB\u10E0\u10D0\u10D5\u10D0\u10DA\u10D4\u10DC\u10DD\u10D5\u10D0\u10DC \u10D9\u10DD\u10DB\u10DE\u10D8\u10E3\u10E2\u10D4\u10E0\u10E3\u10DA \u10E1\u10D8\u10E1\u10E2\u10D4\u10DB\u10D4\u10D1\u10E8\u10D8.\n\nRussian:\n\n  From a Unicode conference invitation:\n\n  \u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044C \u0441\u0435\u0439\u0447\u0430\u0441 \u043D\u0430 \u0414\u0435\u0441\u044F\u0442\u0443\u044E \u041C\u0435\u0436\u0434\u0443\u043D\u0430\u0440\u043E\u0434\u043D\u0443\u044E \u041A\u043E\u043D\u0444\u0435\u0440\u0435\u043D\u0446\u0438\u044E \u043F\u043E\n  Unicode, \u043A\u043E\u0442\u043E\u0440\u0430\u044F \u0441\u043E\u0441\u0442\u043E\u0438\u0442\u0441\u044F 10-12 \u043C\u0430\u0440\u0442\u0430 1997 \u0433\u043E\u0434\u0430 \u0432 \u041C\u0430\u0439\u043D\u0446\u0435 \u0432 \u0413\u0435\u0440\u043C\u0430\u043D\u0438\u0438.\n  \u041A\u043E\u043D\u0444\u0435\u0440\u0435\u043D\u0446\u0438\u044F \u0441\u043E\u0431\u0435\u0440\u0435\u0442 \u0448\u0438\u0440\u043E\u043A\u0438\u0439 \u043A\u0440\u0443\u0433 \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432 \u043F\u043E  \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u043E\u0433\u043E\n  \u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442\u0430 \u0438 Unicode, \u043B\u043E\u043A\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u0438 \u0438 \u0438\u043D\u0442\u0435\u0440\u043D\u0430\u0446\u0438\u043E\u043D\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u0438, \u0432\u043E\u043F\u043B\u043E\u0449\u0435\u043D\u0438\u044E \u0438\n  \u043F\u0440\u0438\u043C\u0435\u043D\u0435\u043D\u0438\u044E Unicode \u0432 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u044B\u0445 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0445 \u0438 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0445\n  \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\u0445, \u0448\u0440\u0438\u0444\u0442\u0430\u0445, \u0432\u0435\u0440\u0441\u0442\u043A\u0435 \u0438 \u043C\u043D\u043E\u0433\u043E\u044F\u0437\u044B\u0447\u043D\u044B\u0445 \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u043D\u044B\u0445 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0445.\n\nThai (UCS Level 2):\n\n  Excerpt from a poetry on The Romance of The Three Kingdoms (a Chinese\n  classic 'San Gua'):\n\n  [----------------------------|------------------------]\n    \u0E4F \u0E41\u0E1C\u0E48\u0E19\u0E14\u0E34\u0E19\u0E2E\u0E31\u0E48\u0E19\u0E40\u0E2A\u0E37\u0E48\u0E2D\u0E21\u0E42\u0E17\u0E23\u0E21\u0E41\u0E2A\u0E19\u0E2A\u0E31\u0E07\u0E40\u0E27\u0E0A  \u0E1E\u0E23\u0E30\u0E1B\u0E01\u0E40\u0E01\u0E28\u0E01\u0E2D\u0E07\u0E1A\u0E39\u0E4A\u0E01\u0E39\u0E49\u0E02\u0E36\u0E49\u0E19\u0E43\u0E2B\u0E21\u0E48\n  \u0E2A\u0E34\u0E1A\u0E2A\u0E2D\u0E07\u0E01\u0E29\u0E31\u0E15\u0E23\u0E34\u0E22\u0E4C\u0E01\u0E48\u0E2D\u0E19\u0E2B\u0E19\u0E49\u0E32\u0E41\u0E25\u0E16\u0E31\u0E14\u0E44\u0E1B       \u0E2A\u0E2D\u0E07\u0E2D\u0E07\u0E04\u0E4C\u0E44\u0E0B\u0E23\u0E49\u0E42\u0E07\u0E48\u0E40\u0E02\u0E25\u0E32\u0E40\u0E1A\u0E32\u0E1B\u0E31\u0E0D\u0E0D\u0E32\n    \u0E17\u0E23\u0E07\u0E19\u0E31\u0E1A\u0E16\u0E37\u0E2D\u0E02\u0E31\u0E19\u0E17\u0E35\u0E40\u0E1B\u0E47\u0E19\u0E17\u0E35\u0E48\u0E1E\u0E36\u0E48\u0E07           \u0E1A\u0E49\u0E32\u0E19\u0E40\u0E21\u0E37\u0E2D\u0E07\u0E08\u0E36\u0E07\u0E27\u0E34\u0E1B\u0E23\u0E34\u0E15\u0E40\u0E1B\u0E47\u0E19\u0E19\u0E31\u0E01\u0E2B\u0E19\u0E32\n  \u0E42\u0E2E\u0E08\u0E34\u0E4B\u0E19\u0E40\u0E23\u0E35\u0E22\u0E01\u0E17\u0E31\u0E1E\u0E17\u0E31\u0E48\u0E27\u0E2B\u0E31\u0E27\u0E40\u0E21\u0E37\u0E2D\u0E07\u0E21\u0E32         \u0E2B\u0E21\u0E32\u0E22\u0E08\u0E30\u0E06\u0E48\u0E32\u0E21\u0E14\u0E0A\u0E31\u0E48\u0E27\u0E15\u0E31\u0E27\u0E2A\u0E33\u0E04\u0E31\u0E0D\n    \u0E40\u0E2B\u0E21\u0E37\u0E2D\u0E19\u0E02\u0E31\u0E1A\u0E44\u0E2A\u0E44\u0E25\u0E48\u0E40\u0E2A\u0E37\u0E2D\u0E08\u0E32\u0E01\u0E40\u0E04\u0E2B\u0E32      \u0E23\u0E31\u0E1A\u0E2B\u0E21\u0E32\u0E1B\u0E48\u0E32\u0E40\u0E02\u0E49\u0E32\u0E21\u0E32\u0E40\u0E25\u0E22\u0E2D\u0E32\u0E2A\u0E31\u0E0D\n  \u0E1D\u0E48\u0E32\u0E22\u0E2D\u0E49\u0E2D\u0E07\u0E2D\u0E38\u0E49\u0E19\u0E22\u0E38\u0E41\u0E22\u0E01\u0E43\u0E2B\u0E49\u0E41\u0E15\u0E01\u0E01\u0E31\u0E19          \u0E43\u0E0A\u0E49\u0E2A\u0E32\u0E27\u0E19\u0E31\u0E49\u0E19\u0E40\u0E1B\u0E47\u0E19\u0E0A\u0E19\u0E27\u0E19\u0E0A\u0E37\u0E48\u0E19\u0E0A\u0E27\u0E19\u0E43\u0E08\n    \u0E1E\u0E25\u0E31\u0E19\u0E25\u0E34\u0E09\u0E38\u0E22\u0E01\u0E38\u0E22\u0E01\u0E35\u0E01\u0E25\u0E31\u0E1A\u0E01\u0E48\u0E2D\u0E40\u0E2B\u0E15\u0E38          \u0E0A\u0E48\u0E32\u0E07\u0E2D\u0E32\u0E40\u0E1E\u0E28\u0E08\u0E23\u0E34\u0E07\u0E2B\u0E19\u0E32\u0E1F\u0E49\u0E32\u0E23\u0E49\u0E2D\u0E07\u0E44\u0E2B\u0E49\n  \u0E15\u0E49\u0E2D\u0E07\u0E23\u0E1A\u0E23\u0E32\u0E06\u0E48\u0E32\u0E1F\u0E31\u0E19\u0E08\u0E19\u0E1A\u0E23\u0E23\u0E25\u0E31\u0E22           \u0E24\u0E45\u0E2B\u0E32\u0E43\u0E04\u0E23\u0E04\u0E49\u0E33\u0E0A\u0E39\u0E01\u0E39\u0E49\u0E1A\u0E23\u0E23\u0E25\u0E31\u0E07\u0E01\u0E4C \u0E2F\n\n  (The above is a two-column text. If combining characters are handled\n  correctly, the lines of the second column should be aligned with the\n  | character above.)\n\nEthiopian:\n\n  Proverbs in the Amharic language:\n\n  \u1230\u121B\u12ED \u12A0\u12ED\u1273\u1228\u1235 \u1295\u1309\u1225 \u12A0\u12ED\u12A8\u1230\u1235\u1362\n  \u1265\u120B \u12AB\u1208\u129D \u12A5\u1295\u12F0\u12A0\u1263\u1274 \u1260\u1246\u1218\u1320\u129D\u1362\n  \u130C\u1325 \u12EB\u1208\u1264\u1271 \u1241\u121D\u1325\u1293 \u1290\u12CD\u1362\n  \u12F0\u1200 \u1260\u1215\u120D\u1219 \u1245\u1264 \u1263\u12ED\u1320\u1323 \u1295\u1323\u1275 \u1260\u1308\u12F0\u1208\u12CD\u1362\n  \u12E8\u12A0\u134D \u12C8\u1208\u121D\u1273 \u1260\u1245\u1264 \u12A0\u12ED\u1273\u123D\u121D\u1362\n  \u12A0\u12ED\u1325 \u1260\u1260\u120B \u12F3\u12CB \u1270\u1218\u1273\u1362\n  \u1232\u1270\u1228\u1309\u1219 \u12ED\u12F0\u1228\u130D\u1219\u1362\n  \u1240\u1235 \u1260\u1240\u1235\u1365 \u12D5\u1295\u1241\u120B\u120D \u1260\u12A5\u130D\u1229 \u12ED\u1204\u12F3\u120D\u1362\n  \u12F5\u122D \u1262\u12EB\u1265\u122D \u12A0\u1295\u1260\u1233 \u12EB\u1235\u122D\u1362\n  \u1230\u12CD \u12A5\u1295\u12F0\u1264\u1271 \u12A5\u1295\u1305 \u12A5\u1295\u12F0 \u1309\u1228\u1264\u1271 \u12A0\u12ED\u1270\u12F3\u12F0\u122D\u121D\u1362\n  \u12A5\u130D\u12DC\u122D \u12E8\u12A8\u1348\u1270\u12CD\u1295 \u1309\u122E\u122E \u1233\u12ED\u12D8\u130B\u12CD \u12A0\u12ED\u12F5\u122D\u121D\u1362\n  \u12E8\u130E\u1228\u1264\u1275 \u120C\u1263\u1365 \u1262\u12EB\u12E9\u1275 \u12ED\u1235\u1245 \u1263\u12EB\u12E9\u1275 \u12EB\u1320\u120D\u1245\u1362\n  \u1225\u122B \u12A8\u1218\u134D\u1273\u1275 \u120D\u1304\u1295 \u120B\u134B\u1273\u1275\u1362\n  \u12D3\u1263\u12ED \u121B\u12F0\u122A\u12EB \u12E8\u1208\u12CD\u1365 \u130D\u1295\u12F5 \u12ED\u12DE \u12ED\u12DE\u122B\u120D\u1362\n  \u12E8\u12A5\u1235\u120B\u121D \u12A0\u1308\u1229 \u1218\u12AB \u12E8\u12A0\u121E\u122B \u12A0\u1308\u1229 \u12CB\u122D\u12AB\u1362\n  \u1270\u1295\u130B\u120E \u1262\u1270\u1349 \u1270\u1218\u120D\u1236 \u1263\u1349\u1362\n  \u12C8\u12F3\u1305\u1205 \u121B\u122D \u1262\u1206\u1295 \u1328\u122D\u1235\u1205 \u12A0\u1275\u120B\u1230\u12CD\u1362\n  \u12A5\u130D\u122D\u1205\u1295 \u1260\u134D\u122B\u123D\u1205 \u120D\u12AD \u12D8\u122D\u130B\u1362\n\nRunes:\n\n  \u16BB\u16D6 \u16B3\u16B9\u16AB\u16A6 \u16A6\u16AB\u16CF \u16BB\u16D6 \u16D2\u16A2\u16DE\u16D6 \u16A9\u16BE \u16A6\u16AB\u16D7 \u16DA\u16AA\u16BE\u16DE\u16D6 \u16BE\u16A9\u16B1\u16A6\u16B9\u16D6\u16AA\u16B1\u16DE\u16A2\u16D7 \u16B9\u16C1\u16A6 \u16A6\u16AA \u16B9\u16D6\u16E5\u16AB\n\n  (Old English, which transcribed into Latin reads 'He cwaeth that he\n  bude thaem lande northweardum with tha Westsae.' and means 'He said\n  that he lived in the northern land near the Western Sea.')\n\nBraille:\n\n  \u284C\u2801\u2827\u2811 \u283C\u2801\u2812  \u284D\u281C\u2807\u2811\u2839\u2830\u280E \u2863\u2815\u280C\n\n  \u284D\u281C\u2807\u2811\u2839 \u283A\u2801\u280E \u2819\u2811\u2801\u2819\u2812 \u281E\u2815 \u2803\u2811\u281B\u2814 \u283A\u280A\u2839\u2832 \u2879\u283B\u2811 \u280A\u280E \u281D\u2815 \u2819\u2833\u2803\u281E\n  \u2831\u2801\u281E\u2811\u2827\u283B \u2801\u2803\u2833\u281E \u2839\u2801\u281E\u2832 \u2879\u2811 \u2817\u2811\u281B\u280A\u280C\u283B \u2815\u280B \u2819\u280A\u280E \u2803\u2825\u2817\u280A\u2801\u2807 \u283A\u2801\u280E\n  \u280E\u280A\u281B\u281D\u282B \u2803\u2839 \u2839\u2811 \u280A\u2807\u283B\u281B\u2839\u280D\u2801\u281D\u2802 \u2839\u2811 \u280A\u2807\u283B\u2805\u2802 \u2839\u2811 \u2825\u281D\u2819\u283B\u281E\u2801\u2805\u283B\u2802\n  \u2801\u281D\u2819 \u2839\u2811 \u2821\u280A\u2811\u280B \u280D\u2833\u2817\u281D\u283B\u2832 \u284E\u280A\u2817\u2815\u2815\u281B\u2811 \u280E\u280A\u281B\u281D\u282B \u280A\u281E\u2832 \u2841\u281D\u2819\n  \u284E\u280A\u2817\u2815\u2815\u281B\u2811\u2830\u280E \u281D\u2801\u280D\u2811 \u283A\u2801\u280E \u281B\u2815\u2815\u2819 \u2825\u280F\u2815\u281D \u2830\u2861\u2801\u281D\u281B\u2811\u2802 \u280B\u2815\u2817 \u2801\u281D\u2839\u2839\u2814\u281B \u2819\u2811\n  \u2821\u2815\u280E\u2811 \u281E\u2815 \u280F\u2825\u281E \u2819\u280A\u280E \u2819\u2801\u281D\u2819 \u281E\u2815\u2832\n\n  \u2855\u2807\u2819 \u284D\u281C\u2807\u2811\u2839 \u283A\u2801\u280E \u2801\u280E \u2819\u2811\u2801\u2819 \u2801\u280E \u2801 \u2819\u2815\u2815\u2817\u2824\u281D\u2801\u280A\u2807\u2832\n\n  \u284D\u2814\u2819\u2816 \u284A \u2819\u2815\u281D\u2830\u281E \u280D\u2811\u2801\u281D \u281E\u2815 \u280E\u2801\u2839 \u2839\u2801\u281E \u284A \u2805\u281D\u282A\u2802 \u2815\u280B \u280D\u2839\n  \u282A\u281D \u2805\u281D\u282A\u2807\u282B\u281B\u2811\u2802 \u2831\u2801\u281E \u2839\u283B\u2811 \u280A\u280E \u280F\u281C\u281E\u280A\u280A\u2825\u2807\u281C\u2807\u2839 \u2819\u2811\u2801\u2819 \u2801\u2803\u2833\u281E\n  \u2801 \u2819\u2815\u2815\u2817\u2824\u281D\u2801\u280A\u2807\u2832 \u284A \u280D\u280A\u2823\u281E \u2819\u2801\u2827\u2811 \u2803\u2811\u2832 \u2814\u280A\u2807\u2814\u282B\u2802 \u280D\u2839\u280E\u2811\u2807\u280B\u2802 \u281E\u2815\n  \u2817\u2811\u281B\u281C\u2819 \u2801 \u280A\u2815\u280B\u280B\u2814\u2824\u281D\u2801\u280A\u2807 \u2801\u280E \u2839\u2811 \u2819\u2811\u2801\u2819\u2811\u280C \u280F\u280A\u2811\u280A\u2811 \u2815\u280B \u280A\u2817\u2815\u281D\u280D\u2815\u281D\u281B\u283B\u2839\n  \u2814 \u2839\u2811 \u281E\u2817\u2801\u2819\u2811\u2832 \u2843\u2825\u281E \u2839\u2811 \u283A\u280A\u280E\u2819\u2815\u280D \u2815\u280B \u2833\u2817 \u2801\u281D\u280A\u2811\u280C\u2815\u2817\u280E\n  \u280A\u280E \u2814 \u2839\u2811 \u280E\u280A\u280D\u280A\u2807\u2811\u2806 \u2801\u281D\u2819 \u280D\u2839 \u2825\u281D\u2819\u2801\u2807\u2807\u282A\u282B \u2819\u2801\u281D\u2819\u280E\n  \u2829\u2801\u2807\u2807 \u281D\u2815\u281E \u2819\u280A\u280C\u2825\u2817\u2803 \u280A\u281E\u2802 \u2815\u2817 \u2839\u2811 \u284A\u2833\u281D\u281E\u2817\u2839\u2830\u280E \u2819\u2815\u281D\u2811 \u280B\u2815\u2817\u2832 \u2879\u2833\n  \u283A\u280A\u2807\u2807 \u2839\u283B\u2811\u280B\u2815\u2817\u2811 \u280F\u283B\u280D\u280A\u281E \u280D\u2811 \u281E\u2815 \u2817\u2811\u280F\u2811\u2801\u281E\u2802 \u2811\u280D\u280F\u2819\u2801\u281E\u280A\u280A\u2801\u2807\u2807\u2839\u2802 \u2839\u2801\u281E\n  \u284D\u281C\u2807\u2811\u2839 \u283A\u2801\u280E \u2801\u280E \u2819\u2811\u2801\u2819 \u2801\u280E \u2801 \u2819\u2815\u2815\u2817\u2824\u281D\u2801\u280A\u2807\u2832\n\n  (The first couple of paragraphs of \"A Christmas Carol\" by Dickens)\n\nCompact font selection example text:\n\n  ABCDEFGHIJKLMNOPQRSTUVWXYZ /0123456789\n  abcdefghijklmnopqrstuvwxyz \u00A3\u00A9\u00B5\u00C0\u00C6\u00D6\u00DE\u00DF\u00E9\u00F6\u00FF\n  \u2013\u2014\u2018\u201C\u201D\u201E\u2020\u2022\u2026\u2030\u2122\u0153\u0160\u0178\u017E\u20AC \u0391\u0392\u0393\u0394\u03A9\u03B1\u03B2\u03B3\u03B4\u03C9 \u0410\u0411\u0412\u0413\u0414\u0430\u0431\u0432\u0433\u0434\n  \u2200\u2202\u2208\u211D\u2227\u222A\u2261\u221E \u2191\u2197\u21A8\u21BB\u21E3 \u2510\u253C\u2554\u2558\u2591\u25BA\u263A\u2640 \uFB01\uFFFD\u2440\u2082\u1F20\u1E02\u04E5\u1E84\u0250\u02D0\u234E\u05D0\u0531\u10D0\n\nGreetings in various languages:\n\n  Hello world, \u039A\u03B1\u03BB\u03B7\u03BC\u1F73\u03C1\u03B1 \u03BA\u1F79\u03C3\u03BC\u03B5, \u30B3\u30F3\u30CB\u30C1\u30CF\n\nBox drawing alignment tests:                                          \u2588\n                                                                      \u2589\n  \u2554\u2550\u2550\u2566\u2550\u2550\u2557  \u250C\u2500\u2500\u252C\u2500\u2500\u2510  \u256D\u2500\u2500\u252C\u2500\u2500\u256E  \u256D\u2500\u2500\u252C\u2500\u2500\u256E  \u250F\u2501\u2501\u2533\u2501\u2501\u2513  \u250E\u2512\u250F\u2511   \u2577  \u257B \u250F\u252F\u2513 \u250C\u2530\u2510    \u258A \u2571\u2572\u2571\u2572\u2573\u2573\u2573\n  \u2551\u250C\u2500\u2568\u2500\u2510\u2551  \u2502\u2554\u2550\u2567\u2550\u2557\u2502  \u2502\u2552\u2550\u256A\u2550\u2555\u2502  \u2502\u2553\u2500\u2541\u2500\u2556\u2502  \u2503\u250C\u2500\u2542\u2500\u2510\u2503  \u2517\u2543\u2544\u2519  \u2576\u253C\u2574\u257A\u254B\u2578\u2520\u253C\u2528 \u251D\u254B\u2525    \u258B \u2572\u2571\u2572\u2571\u2573\u2573\u2573\n  \u2551\u2502\u2572 \u2571\u2502\u2551  \u2502\u2551   \u2551\u2502  \u2502\u2502 \u2502 \u2502\u2502  \u2502\u2551 \u2503 \u2551\u2502  \u2503\u2502 \u257F \u2502\u2503  \u250D\u2545\u2546\u2513   \u2575  \u2579 \u2517\u2537\u251B \u2514\u2538\u2518    \u258C \u2571\u2572\u2571\u2572\u2573\u2573\u2573\n  \u2560\u2561 \u2573 \u255E\u2563  \u251C\u2562   \u255F\u2524  \u251C\u253C\u2500\u253C\u2500\u253C\u2524  \u251C\u256B\u2500\u2542\u2500\u256B\u2524  \u2523\u253F\u257E\u253C\u257C\u253F\u252B  \u2515\u251B\u2516\u251A     \u250C\u2504\u2504\u2510 \u254E \u250F\u2505\u2505\u2513 \u250B \u258D \u2572\u2571\u2572\u2571\u2573\u2573\u2573\n  \u2551\u2502\u2571 \u2572\u2502\u2551  \u2502\u2551   \u2551\u2502  \u2502\u2502 \u2502 \u2502\u2502  \u2502\u2551 \u2503 \u2551\u2502  \u2503\u2502 \u257D \u2502\u2503  \u2591\u2591\u2592\u2592\u2593\u2593\u2588\u2588 \u250A  \u2506 \u254E \u254F  \u2507 \u250B \u258E\n  \u2551\u2514\u2500\u2565\u2500\u2518\u2551  \u2502\u255A\u2550\u2564\u2550\u255D\u2502  \u2502\u2558\u2550\u256A\u2550\u255B\u2502  \u2502\u2559\u2500\u2540\u2500\u255C\u2502  \u2503\u2514\u2500\u2542\u2500\u2518\u2503  \u2591\u2591\u2592\u2592\u2593\u2593\u2588\u2588 \u250A  \u2506 \u254E \u254F  \u2507 \u250B \u258F\n  \u255A\u2550\u2550\u2569\u2550\u2550\u255D  \u2514\u2500\u2500\u2534\u2500\u2500\u2518  \u2570\u2500\u2500\u2534\u2500\u2500\u256F  \u2570\u2500\u2500\u2534\u2500\u2500\u256F  \u2517\u2501\u2501\u253B\u2501\u2501\u251B  \u2597\u2584\u2596\u259B\u2580\u259C   \u2514\u254C\u254C\u2518 \u254E \u2517\u254D\u254D\u251B \u250B  \u2581\u2582\u2583\u2584\u2585\u2586\u2587\u2588\n                                               \u259D\u2580\u2598\u2599\u2584\u259F\n" .
+<http://drobilla.net/sw/serd/test/good/UTF-8.ttl> <http://www.w3.org/2000/01/rdf-schema#comment> "\n  Two byte Unicode escape: \u00E0\n  Largest Unicode escape in Turtle: \U0010FFFF\n" .
diff --git a/tests/good/UTF-8.ttl b/test/good/UTF-8.ttl
index 82587c57..82587c57 100644
--- a/tests/good/UTF-8.ttl
+++ b/test/good/UTF-8.ttl
diff --git a/test/good/base.nt b/test/good/base.nt
new file mode 100644
index 00000000..4e8e4c82
--- /dev/null
+++ b/test/good/base.nt
@@ -0,0 +1 @@
+<http://drobilla.net/sw/serd/test/good/foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://drobilla.net/sw/serd/test/good/Bar> .
diff --git a/tests/good/base.ttl b/test/good/base.ttl
index 4c437937..4c437937 100644
--- a/tests/good/base.ttl
+++ b/test/good/base.ttl
diff --git a/tests/good/manifest.ttl b/test/good/manifest.ttl
index 1a482f2d..1a482f2d 100644
--- a/tests/good/manifest.ttl
+++ b/test/good/manifest.ttl
diff --git a/tests/good/qualify-in.ttl b/test/good/qualify-in.ttl
index d938b7bd..d938b7bd 100644
--- a/tests/good/qualify-in.ttl
+++ b/test/good/qualify-in.ttl
diff --git a/tests/good/qualify-out.ttl b/test/good/qualify-out.ttl
index 97f67a53..97f67a53 100644
--- a/tests/good/qualify-out.ttl
+++ b/test/good/qualify-out.ttl
diff --git a/tests/good/test-14.nt b/test/good/test-14.nt
index 791b3a7a..791b3a7a 100644
--- a/tests/good/test-14.nt
+++ b/test/good/test-14.nt
diff --git a/tests/good/test-14.ttl b/test/good/test-14.ttl
index ad9dbde8..ad9dbde8 100644
--- a/tests/good/test-14.ttl
+++ b/test/good/test-14.ttl
diff --git a/tests/good/test-15.nt b/test/good/test-15.nt
index c0604b3b..c0604b3b 100644
--- a/tests/good/test-15.nt
+++ b/test/good/test-15.nt
diff --git a/tests/good/test-15.ttl b/test/good/test-15.ttl
index 10df17df..10df17df 100644
--- a/tests/good/test-15.ttl
+++ b/test/good/test-15.ttl
diff --git a/tests/good/test-16.nt b/test/good/test-16.nt
index c0604b3b..c0604b3b 100644
--- a/tests/good/test-16.nt
+++ b/test/good/test-16.nt
diff --git a/tests/good/test-16.ttl b/test/good/test-16.ttl
index a9ac37fb..a9ac37fb 100644
--- a/tests/good/test-16.ttl
+++ b/test/good/test-16.ttl
diff --git a/tests/good/test-18.nt b/test/good/test-18.nt
index 4ff4b95b..4ff4b95b 100644
--- a/tests/good/test-18.nt
+++ b/test/good/test-18.nt
diff --git a/tests/good/test-18.ttl b/test/good/test-18.ttl
index 1adfa451..1adfa451 100644
--- a/tests/good/test-18.ttl
+++ b/test/good/test-18.ttl
diff --git a/tests/good/test-30.nt b/test/good/test-30.nt
index bae59ced..f400cba6 100644
--- a/tests/good/test-30.nt
+++ b/test/good/test-30.nt
@@ -1,4 +1,4 @@
-<http://drobilla.net/sw/serd/tests/good/a1> <http://drobilla.net/sw/serd/tests/good/b1> <http://drobilla.net/sw/serd/tests/good/c1> .
+<http://drobilla.net/sw/serd/test/good/a1> <http://drobilla.net/sw/serd/test/good/b1> <http://drobilla.net/sw/serd/test/good/c1> .
 <http://example.org/ns/a2> <http://example.org/ns/b2> <http://example.org/ns/c2> .
 <http://example.org/ns/foo/a3> <http://example.org/ns/foo/b3> <http://example.org/ns/foo/c3> .
 <http://example.org/ns/foo/bar#a4> <http://example.org/ns/foo/bar#b4> <http://example.org/ns/foo/bar#c4> .
diff --git a/tests/good/test-30.ttl b/test/good/test-30.ttl
index c8602f32..9aff060f 100644
--- a/tests/good/test-30.ttl
+++ b/test/good/test-30.ttl
@@ -1,4 +1,4 @@
-# In-scope base URI is http://drobilla.net/sw/serd/tests/good/ at this point
+# In-scope base URI is http://drobilla.net/sw/serd/test/good/ at this point
 <a1> <b1> <c1> .
 @base <http://example.org/ns/> .
 # In-scope base URI is http://example.org/ns/ at this point
diff --git a/tests/good/test-a-without-whitespace.nt b/test/good/test-a-without-whitespace.nt
index 27c5e7da..27c5e7da 100644
--- a/tests/good/test-a-without-whitespace.nt
+++ b/test/good/test-a-without-whitespace.nt
diff --git a/tests/good/test-a-without-whitespace.ttl b/test/good/test-a-without-whitespace.ttl
index 2d6db000..2d6db000 100644
--- a/tests/good/test-a-without-whitespace.ttl
+++ b/test/good/test-a-without-whitespace.ttl
diff --git a/tests/good/test-backspace.nt b/test/good/test-backspace.nt
index 3dfffa38..3dfffa38 100644
--- a/tests/good/test-backspace.nt
+++ b/test/good/test-backspace.nt
diff --git a/tests/good/test-backspace.ttl b/test/good/test-backspace.ttl
index 1e33ba95..1e33ba95 100644
--- a/tests/good/test-backspace.ttl
+++ b/test/good/test-backspace.ttl
diff --git a/tests/good/test-base-nopath.nt b/test/good/test-base-nopath.nt
index 8628a30b..8628a30b 100644
--- a/tests/good/test-base-nopath.nt
+++ b/test/good/test-base-nopath.nt
diff --git a/tests/good/test-base-nopath.ttl b/test/good/test-base-nopath.ttl
index 8735936a..8735936a 100644
--- a/tests/good/test-base-nopath.ttl
+++ b/test/good/test-base-nopath.ttl
diff --git a/tests/good/test-base-query.nt b/test/good/test-base-query.nt
index d40c2f6b..d40c2f6b 100644
--- a/tests/good/test-base-query.nt
+++ b/test/good/test-base-query.nt
diff --git a/tests/good/test-base-query.ttl b/test/good/test-base-query.ttl
index 77638817..77638817 100644
--- a/tests/good/test-base-query.ttl
+++ b/test/good/test-base-query.ttl
diff --git a/tests/good/test-blank-cont.nt b/test/good/test-blank-cont.nt
index a4b44e7d..a4b44e7d 100644
--- a/tests/good/test-blank-cont.nt
+++ b/test/good/test-blank-cont.nt
diff --git a/tests/good/test-blank-cont.ttl b/test/good/test-blank-cont.ttl
index b161cdc4..b161cdc4 100644
--- a/tests/good/test-blank-cont.ttl
+++ b/test/good/test-blank-cont.ttl
diff --git a/tests/good/test-blank-in-list.nt b/test/good/test-blank-in-list.nt
index 36bac6d7..36bac6d7 100644
--- a/tests/good/test-blank-in-list.nt
+++ b/test/good/test-blank-in-list.nt
diff --git a/tests/good/test-blank-in-list.ttl b/test/good/test-blank-in-list.ttl
index 5c0b0766..5c0b0766 100644
--- a/tests/good/test-blank-in-list.ttl
+++ b/test/good/test-blank-in-list.ttl
diff --git a/tests/good/test-blank-node-statement.nt b/test/good/test-blank-node-statement.nt
index 3280b28d..3280b28d 100644
--- a/tests/good/test-blank-node-statement.nt
+++ b/test/good/test-blank-node-statement.nt
diff --git a/tests/good/test-blank-node-statement.ttl b/test/good/test-blank-node-statement.ttl
index c84f8487..c84f8487 100644
--- a/tests/good/test-blank-node-statement.ttl
+++ b/test/good/test-blank-node-statement.ttl
diff --git a/tests/good/test-blankdot.nt b/test/good/test-blankdot.nt
index 9d4b769b..9d4b769b 100644
--- a/tests/good/test-blankdot.nt
+++ b/test/good/test-blankdot.nt
diff --git a/tests/good/test-blankdot.ttl b/test/good/test-blankdot.ttl
index a6ee7234..a6ee7234 100644
--- a/tests/good/test-blankdot.ttl
+++ b/test/good/test-blankdot.ttl
diff --git a/tests/good/test-bom.nt b/test/good/test-bom.nt
index aea1655b..aea1655b 100644
--- a/tests/good/test-bom.nt
+++ b/test/good/test-bom.nt
diff --git a/tests/good/test-bom.ttl b/test/good/test-bom.ttl
index 8d6534e1..8d6534e1 100644
--- a/tests/good/test-bom.ttl
+++ b/test/good/test-bom.ttl
diff --git a/tests/good/test-cr.nt b/test/good/test-cr.nt
index aea1655b..aea1655b 100644
--- a/tests/good/test-cr.nt
+++ b/test/good/test-cr.nt
diff --git a/tests/good/test-cr.ttl b/test/good/test-cr.ttl
index 5410648a..5410648a 100644
--- a/tests/good/test-cr.ttl
+++ b/test/good/test-cr.ttl
diff --git a/tests/good/test-delete.nt b/test/good/test-delete.nt
index 41ac8062..41ac8062 100644
--- a/tests/good/test-delete.nt
+++ b/test/good/test-delete.nt
diff --git a/tests/good/test-delete.ttl b/test/good/test-delete.ttl
index 4bc97060..4bc97060 100644
--- a/tests/good/test-delete.ttl
+++ b/test/good/test-delete.ttl
diff --git a/tests/good/test-digit-start-pname.nt b/test/good/test-digit-start-pname.nt
index 66eab7db..66eab7db 100644
--- a/tests/good/test-digit-start-pname.nt
+++ b/test/good/test-digit-start-pname.nt
diff --git a/tests/good/test-digit-start-pname.ttl b/test/good/test-digit-start-pname.ttl
index 6ca8ade8..6ca8ade8 100644
--- a/tests/good/test-digit-start-pname.ttl
+++ b/test/good/test-digit-start-pname.ttl
diff --git a/tests/good/test-empty-path-base.nt b/test/good/test-empty-path-base.nt
index 9ad50617..9ad50617 100644
--- a/tests/good/test-empty-path-base.nt
+++ b/test/good/test-empty-path-base.nt
diff --git a/tests/good/test-empty-path-base.ttl b/test/good/test-empty-path-base.ttl
index 8410553a..8410553a 100644
--- a/tests/good/test-empty-path-base.ttl
+++ b/test/good/test-empty-path-base.ttl
diff --git a/tests/good/test-empty.nt b/test/good/test-empty.nt
index e69de29b..e69de29b 100644
--- a/tests/good/test-empty.nt
+++ b/test/good/test-empty.nt
diff --git a/tests/good/test-empty.ttl b/test/good/test-empty.ttl
index e69de29b..e69de29b 100644
--- a/tests/good/test-empty.ttl
+++ b/test/good/test-empty.ttl
diff --git a/tests/good/test-eof-at-page-end.nt b/test/good/test-eof-at-page-end.nt
index 64d24586..64d24586 100644
--- a/tests/good/test-eof-at-page-end.nt
+++ b/test/good/test-eof-at-page-end.nt
diff --git a/tests/good/test-eof-at-page-end.ttl b/test/good/test-eof-at-page-end.ttl
index d6d9af26..d6d9af26 100644
--- a/tests/good/test-eof-at-page-end.ttl
+++ b/test/good/test-eof-at-page-end.ttl
diff --git a/tests/good/test-escapes.nt b/test/good/test-escapes.nt
index e30222e7..e30222e7 100644
--- a/tests/good/test-escapes.nt
+++ b/test/good/test-escapes.nt
diff --git a/tests/good/test-escapes.ttl b/test/good/test-escapes.ttl
index e30222e7..e30222e7 100644
--- a/tests/good/test-escapes.ttl
+++ b/test/good/test-escapes.ttl
diff --git a/tests/good/test-ext-namedblank-iri.nt b/test/good/test-ext-namedblank-iri.nt
index 26075a73..26075a73 100644
--- a/tests/good/test-ext-namedblank-iri.nt
+++ b/test/good/test-ext-namedblank-iri.nt
diff --git a/tests/good/test-ext-namedblank-iri.ttl b/test/good/test-ext-namedblank-iri.ttl
index 28fb32ab..28fb32ab 100644
--- a/tests/good/test-ext-namedblank-iri.ttl
+++ b/test/good/test-ext-namedblank-iri.ttl
diff --git a/tests/good/test-ext-namedblank-prefix.nt b/test/good/test-ext-namedblank-prefix.nt
index 9a2710fb..9a2710fb 100644
--- a/tests/good/test-ext-namedblank-prefix.nt
+++ b/test/good/test-ext-namedblank-prefix.nt
diff --git a/tests/good/test-ext-namedblank-prefix.ttl b/test/good/test-ext-namedblank-prefix.ttl
index 7de79655..7de79655 100644
--- a/tests/good/test-ext-namedblank-prefix.ttl
+++ b/test/good/test-ext-namedblank-prefix.ttl
diff --git a/tests/good/test-form-feed.nt b/test/good/test-form-feed.nt
index 05478971..05478971 100644
--- a/tests/good/test-form-feed.nt
+++ b/test/good/test-form-feed.nt
diff --git a/tests/good/test-form-feed.ttl b/test/good/test-form-feed.ttl
index 78921159..78921159 100644
--- a/tests/good/test-form-feed.ttl
+++ b/test/good/test-form-feed.ttl
diff --git a/tests/good/test-id.nt b/test/good/test-id.nt
index b4b11069..b4b11069 100644
--- a/tests/good/test-id.nt
+++ b/test/good/test-id.nt
diff --git a/tests/good/test-id.ttl b/test/good/test-id.ttl
index cfd0e9ca..cfd0e9ca 100644
--- a/tests/good/test-id.ttl
+++ b/test/good/test-id.ttl
diff --git a/tests/good/test-lang.nt b/test/good/test-lang.nt
index 61daecb3..61daecb3 100644
--- a/tests/good/test-lang.nt
+++ b/test/good/test-lang.nt
diff --git a/tests/good/test-lang.ttl b/test/good/test-lang.ttl
index b0616475..b0616475 100644
--- a/tests/good/test-lang.ttl
+++ b/test/good/test-lang.ttl
diff --git a/tests/good/test-list-in-blank.nt b/test/good/test-list-in-blank.nt
index 108363f2..108363f2 100644
--- a/tests/good/test-list-in-blank.nt
+++ b/test/good/test-list-in-blank.nt
diff --git a/tests/good/test-list-in-blank.ttl b/test/good/test-list-in-blank.ttl
index bdf75fce..bdf75fce 100644
--- a/tests/good/test-list-in-blank.ttl
+++ b/test/good/test-list-in-blank.ttl
diff --git a/tests/good/test-list-subject.nt b/test/good/test-list-subject.nt
index e4f9c40c..e4f9c40c 100644
--- a/tests/good/test-list-subject.nt
+++ b/test/good/test-list-subject.nt
diff --git a/tests/good/test-list-subject.ttl b/test/good/test-list-subject.ttl
index 5cd81dfb..5cd81dfb 100644
--- a/tests/good/test-list-subject.ttl
+++ b/test/good/test-list-subject.ttl
diff --git a/tests/good/test-list.nt b/test/good/test-list.nt
index 3a27a5a6..3a27a5a6 100644
--- a/tests/good/test-list.nt
+++ b/test/good/test-list.nt
diff --git a/tests/good/test-list.ttl b/test/good/test-list.ttl
index 7f4c7699..7f4c7699 100644
--- a/tests/good/test-list.ttl
+++ b/test/good/test-list.ttl
diff --git a/tests/good/test-local-name-ends-with-dot.ttl b/test/good/test-local-name-ends-with-dot.ttl
index e426876d..e426876d 100644
--- a/tests/good/test-local-name-ends-with-dot.ttl
+++ b/test/good/test-local-name-ends-with-dot.ttl
diff --git a/tests/good/test-long-string.nt b/test/good/test-long-string.nt
index ba6be49c..ba6be49c 100644
--- a/tests/good/test-long-string.nt
+++ b/test/good/test-long-string.nt
diff --git a/tests/good/test-long-string.ttl b/test/good/test-long-string.ttl
index 7da44b4b..7da44b4b 100644
--- a/tests/good/test-long-string.ttl
+++ b/test/good/test-long-string.ttl
diff --git a/tests/good/test-no-spaces.nt b/test/good/test-no-spaces.nt
index 3619a5f0..3619a5f0 100644
--- a/tests/good/test-no-spaces.nt
+++ b/test/good/test-no-spaces.nt
diff --git a/tests/good/test-no-spaces.ttl b/test/good/test-no-spaces.ttl
index 88171e71..88171e71 100644
--- a/tests/good/test-no-spaces.ttl
+++ b/test/good/test-no-spaces.ttl
diff --git a/tests/good/test-non-curie-uri.nt b/test/good/test-non-curie-uri.nt
index 502a8754..502a8754 100644
--- a/tests/good/test-non-curie-uri.nt
+++ b/test/good/test-non-curie-uri.nt
diff --git a/tests/good/test-non-curie-uri.ttl b/test/good/test-non-curie-uri.ttl
index 40734514..40734514 100644
--- a/tests/good/test-non-curie-uri.ttl
+++ b/test/good/test-non-curie-uri.ttl
diff --git a/tests/good/test-num.nt b/test/good/test-num.nt
index 54263d46..54263d46 100644
--- a/tests/good/test-num.nt
+++ b/test/good/test-num.nt
diff --git a/tests/good/test-num.ttl b/test/good/test-num.ttl
index 68ad290b..68ad290b 100644
--- a/tests/good/test-num.ttl
+++ b/test/good/test-num.ttl
diff --git a/tests/good/test-out-of-range-unicode.nt b/test/good/test-out-of-range-unicode.nt
index 5def9e31..5def9e31 100644
--- a/tests/good/test-out-of-range-unicode.nt
+++ b/test/good/test-out-of-range-unicode.nt
diff --git a/tests/good/test-out-of-range-unicode.ttl b/test/good/test-out-of-range-unicode.ttl
index 7e64785a..7e64785a 100644
--- a/tests/good/test-out-of-range-unicode.ttl
+++ b/test/good/test-out-of-range-unicode.ttl
diff --git a/tests/good/test-prefix.nt b/test/good/test-prefix.nt
index bcfdd4b6..bcfdd4b6 100644
--- a/tests/good/test-prefix.nt
+++ b/test/good/test-prefix.nt
diff --git a/tests/good/test-prefix.ttl b/test/good/test-prefix.ttl
index f79896cb..f79896cb 100644
--- a/tests/good/test-prefix.ttl
+++ b/test/good/test-prefix.ttl
diff --git a/tests/good/test-pretty.nt b/test/good/test-pretty.nt
index 9251563a..9251563a 100644
--- a/tests/good/test-pretty.nt
+++ b/test/good/test-pretty.nt
diff --git a/tests/good/test-pretty.ttl b/test/good/test-pretty.ttl
index 4eb7204f..4eb7204f 100644
--- a/tests/good/test-pretty.ttl
+++ b/test/good/test-pretty.ttl
diff --git a/test/good/test-rel.nt b/test/good/test-rel.nt
new file mode 100644
index 00000000..343ce19c
--- /dev/null
+++ b/test/good/test-rel.nt
@@ -0,0 +1,6 @@
+<http://drobilla.net/sw/serd/test/good/a/b/c> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
+<http://drobilla.net/sw/serd/test> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
+<http://drobilla.net/sw/serd/test/good/test-rel.ttl> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
+<http://drobilla.net/sw/serd/test/good/test-not.ttl> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
+<http://drobilla.net/sw/serd/test/good/a/b/c> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
+<http://www.w3.org/> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
diff --git a/test/good/test-rel.ttl b/test/good/test-rel.ttl
new file mode 100644
index 00000000..4752be70
--- /dev/null
+++ b/test/good/test-rel.ttl
@@ -0,0 +1,6 @@
+<http://drobilla.net/sw/serd/test/good/a/b/c> a <http://example.org/Thing> .
+<http://drobilla.net/sw/serd/test> a <http://example.org/Thing> .
+<http://drobilla.net/sw/serd/test/good/test-rel.ttl> a <http://example.org/Thing> .
+<http://drobilla.net/sw/serd/test/good/test-not.ttl> a <http://example.org/Thing> .
+<a/b/c> a <http://example.org/Thing> .
+<http://www.w3.org/> a <http://example.org/Thing> .
diff --git a/tests/good/test-semi-dot.nt b/test/good/test-semi-dot.nt
index aea1655b..aea1655b 100644
--- a/tests/good/test-semi-dot.nt
+++ b/test/good/test-semi-dot.nt
diff --git a/tests/good/test-semi-dot.ttl b/test/good/test-semi-dot.ttl
index 6d4b4146..6d4b4146 100644
--- a/tests/good/test-semi-dot.ttl
+++ b/test/good/test-semi-dot.ttl
diff --git a/tests/good/test-several-eaten-dots.nq b/test/good/test-several-eaten-dots.nq
index 5cafa59f..5cafa59f 100644
--- a/tests/good/test-several-eaten-dots.nq
+++ b/test/good/test-several-eaten-dots.nq
diff --git a/tests/good/test-several-eaten-dots.trig b/test/good/test-several-eaten-dots.trig
index bab135ed..bab135ed 100644
--- a/tests/good/test-several-eaten-dots.trig
+++ b/test/good/test-several-eaten-dots.trig
diff --git a/tests/good/test-uri-escape.nt b/test/good/test-uri-escape.nt
index 320e7c33..320e7c33 100644
--- a/tests/good/test-uri-escape.nt
+++ b/test/good/test-uri-escape.nt
diff --git a/tests/good/test-uri-escape.ttl b/test/good/test-uri-escape.ttl
index 320e7c33..320e7c33 100644
--- a/tests/good/test-uri-escape.ttl
+++ b/test/good/test-uri-escape.ttl
diff --git a/tests/good/test-uri.nt b/test/good/test-uri.nt
index 1744963c..1744963c 100644
--- a/tests/good/test-uri.nt
+++ b/test/good/test-uri.nt
diff --git a/tests/good/test-uri.ttl b/test/good/test-uri.ttl
index b6a8d967..b6a8d967 100644
--- a/tests/good/test-uri.ttl
+++ b/test/good/test-uri.ttl
diff --git a/tests/good/test-utf8-uri.nt b/test/good/test-utf8-uri.nt
index b8a73a88..b8a73a88 100644
--- a/tests/good/test-utf8-uri.nt
+++ b/test/good/test-utf8-uri.nt
diff --git a/tests/good/test-utf8-uri.ttl b/test/good/test-utf8-uri.ttl
index 51f26ff2..51f26ff2 100644
--- a/tests/good/test-utf8-uri.ttl
+++ b/test/good/test-utf8-uri.ttl
diff --git a/tests/lax/manifest.ttl b/test/lax/manifest.ttl
index e3b11ff4..e3b11ff4 100644
--- a/tests/lax/manifest.ttl
+++ b/test/lax/manifest.ttl
diff --git a/tests/lax/test-bad-uri.nt b/test/lax/test-bad-uri.nt
index 7458e12a..7458e12a 100644
--- a/tests/lax/test-bad-uri.nt
+++ b/test/lax/test-bad-uri.nt
diff --git a/tests/lax/test-bad-uri.ttl b/test/lax/test-bad-uri.ttl
index 8f11b1d7..8f11b1d7 100644
--- a/tests/lax/test-bad-uri.ttl
+++ b/test/lax/test-bad-uri.ttl
diff --git a/tests/lax/test-bad-utf8.nt b/test/lax/test-bad-utf8.nt
index 09200e9d..09200e9d 100644
--- a/tests/lax/test-bad-utf8.nt
+++ b/test/lax/test-bad-utf8.nt
diff --git a/tests/lax/test-bad-utf8.ttl b/test/lax/test-bad-utf8.ttl
index 526a171f..526a171f 100644
--- a/tests/lax/test-bad-utf8.ttl
+++ b/test/lax/test-bad-utf8.ttl
diff --git a/tests/read_chunk_test.c b/test/read_chunk_test.c
index 26165667..26165667 100644
--- a/tests/read_chunk_test.c
+++ b/test/read_chunk_test.c
diff --git a/tests/serd_test.c b/test/serd_test.c
index 05fb0461..05fb0461 100644
--- a/tests/serd_test.c
+++ b/test/serd_test.c
diff --git a/tests/good/UTF-8.nt b/tests/good/UTF-8.nt
deleted file mode 100644
index da9a8a49..00000000
--- a/tests/good/UTF-8.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://drobilla.net/sw/serd/tests/good/UTF-8.ttl> <http://www.w3.org/2000/01/rdf-schema#comment> "\nUTF-8 encoded sample plain-text file\n\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\u203E\n\nMarkus Kuhn [\u02C8ma\u02B3k\u028As ku\u02D0n] <http://www.cl.cam.ac.uk/~mgk25/> \u2014 2002-07-25\n\n\nThe ASCII compatible UTF-8 encoding used in this plain-text file\nis defined in Unicode, ISO 10646-1, and RFC 2279.\n\n\nUsing Unicode/UTF-8, you can write in emails and source code things such as\n\nMathematics and sciences:\n\n  \u222E E\u22C5da = Q,  n \u2192 \u221E, \u2211 f(i) = \u220F g(i),      \u23A7\u23A1\u239B\u250C\u2500\u2500\u2500\u2500\u2500\u2510\u239E\u23A4\u23AB\n                                            \u23AA\u23A2\u239C\u2502a\u00B2+b\u00B3 \u239F\u23A5\u23AA\n  \u2200x\u2208\u211D: \u2308x\u2309 = \u2212\u230A\u2212x\u230B, \u03B1 \u2227 \u00AC\u03B2 = \u00AC(\u00AC\u03B1 \u2228 \u03B2),    \u23AA\u23A2\u239C\u2502\u2500\u2500\u2500\u2500\u2500 \u239F\u23A5\u23AA\n                                            \u23AA\u23A2\u239C\u23B7 c\u2088   \u239F\u23A5\u23AA\n  \u2115 \u2286 \u2115\u2080 \u2282 \u2124 \u2282 \u211A \u2282 \u211D \u2282 \u2102,                   \u23A8\u23A2\u239C       \u239F\u23A5\u23AC\n                                            \u23AA\u23A2\u239C \u221E     \u239F\u23A5\u23AA\n  \u22A5 < a \u2260 b \u2261 c \u2264 d \u226A \u22A4 \u21D2 (\u27E6A\u27E7 \u21D4 \u27EAB\u27EB),      \u23AA\u23A2\u239C \u23B2     \u239F\u23A5\u23AA\n                                            \u23AA\u23A2\u239C \u23B3a\u2071-b\u2071\u239F\u23A5\u23AA\n  2H\u2082 + O\u2082 \u21CC 2H\u2082O, R = 4.7 k\u03A9, \u2300 200 mm     \u23A9\u23A3\u239Di=1    \u23A0\u23A6\u23AD\n\nLinguistics and dictionaries:\n\n  \u00F0i \u0131nt\u0259\u02C8n\u00E6\u0283\u0259n\u0259l f\u0259\u02C8n\u025Bt\u0131k \u0259so\u028Asi\u02C8e\u0131\u0283n\n  Y [\u02C8\u028Fpsil\u0254n], Yen [j\u025Bn], Yoga [\u02C8jo\u02D0g\u0251]\n\nAPL:\n\n  ((V\u2373V)=\u2373\u2374V)/V\u2190,V    \u2337\u2190\u2373\u2192\u2374\u2206\u2207\u2283\u203E\u234E\u2355\u2308\n\nNicer typography in plain text files:\n\n  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557\n  \u2551                                          \u2551\n  \u2551   \u2022 \u2018single\u2019 and \u201Cdouble\u201D quotes         \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 Curly apostrophes: \u201CWe\u2019ve been here\u201D \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 Latin-1 apostrophe and accents: '\u00B4`  \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 \u201Adeutsche\u2018 \u201EAnf\u00FChrungszeichen\u201C       \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 \u2020, \u2021, \u2030, \u2022, 3\u20134, \u2014, \u22125/+5, \u2122, \u2026      \u2551\n  \u2551                                          \u2551\n  \u2551   \u2022 ASCII safety test: 1lI|, 0OD, 8B     \u2551\n  \u2551                      \u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E         \u2551\n  \u2551   \u2022 the euro symbol: \u2502 14.95 \u20AC \u2502         \u2551\n  \u2551                      \u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F         \u2551\n  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D\n\nCombining characters:\n\n  STARG\u039B\u030ATE SG-1, a = v\u0307 = r\u0308, a\u20D1 \u22A5 b\u20D1\n\nGreek (in Polytonic):\n\n  The Greek anthem:\n\n  \u03A3\u1F72 \u03B3\u03BD\u03C9\u03C1\u1F77\u03B6\u03C9 \u1F00\u03C0\u1F78 \u03C4\u1F74\u03BD \u03BA\u1F79\u03C8\u03B7\n  \u03C4\u03BF\u1FE6 \u03C3\u03C0\u03B1\u03B8\u03B9\u03BF\u1FE6 \u03C4\u1F74\u03BD \u03C4\u03C1\u03BF\u03BC\u03B5\u03C1\u1F75,\n  \u03C3\u1F72 \u03B3\u03BD\u03C9\u03C1\u1F77\u03B6\u03C9 \u1F00\u03C0\u1F78 \u03C4\u1F74\u03BD \u1F44\u03C8\u03B7\n  \u03C0\u03BF\u1F7A \u03BC\u1F72 \u03B2\u1F77\u03B1 \u03BC\u03B5\u03C4\u03C1\u1F71\u03B5\u03B9 \u03C4\u1F74 \u03B3\u1FC6.\n\n  \u1FBF\u0391\u03C0\u1FBF \u03C4\u1F70 \u03BA\u1F79\u03BA\u03BA\u03B1\u03BB\u03B1 \u03B2\u03B3\u03B1\u03BB\u03BC\u1F73\u03BD\u03B7\n  \u03C4\u1FF6\u03BD \u1FFE\u0395\u03BB\u03BB\u1F75\u03BD\u03C9\u03BD \u03C4\u1F70 \u1F31\u03B5\u03C1\u1F71\n  \u03BA\u03B1\u1F76 \u03C3\u1F70\u03BD \u03C0\u03C1\u1FF6\u03C4\u03B1 \u1F00\u03BD\u03B4\u03C1\u03B5\u03B9\u03C9\u03BC\u1F73\u03BD\u03B7\n  \u03C7\u03B1\u1FD6\u03C1\u03B5, \u1F66 \u03C7\u03B1\u1FD6\u03C1\u03B5, \u1FBF\u0395\u03BB\u03B5\u03C5\u03B8\u03B5\u03C1\u03B9\u1F71!\n\n  From a speech of Demosthenes in the 4th century BC:\n\n  \u039F\u1F50\u03C7\u1F76 \u03C4\u03B1\u1F50\u03C4\u1F70 \u03C0\u03B1\u03C1\u1F77\u03C3\u03C4\u03B1\u03C4\u03B1\u1F77 \u03BC\u03BF\u03B9 \u03B3\u03B9\u03B3\u03BD\u1F7D\u03C3\u03BA\u03B5\u03B9\u03BD, \u1F66 \u1F04\u03BD\u03B4\u03C1\u03B5\u03C2 \u1FBF\u0391\u03B8\u03B7\u03BD\u03B1\u1FD6\u03BF\u03B9,\n  \u1F45\u03C4\u03B1\u03BD \u03C4\u1FBF \u03B5\u1F30\u03C2 \u03C4\u1F70 \u03C0\u03C1\u1F71\u03B3\u03BC\u03B1\u03C4\u03B1 \u1F00\u03C0\u03BF\u03B2\u03BB\u1F73\u03C8\u03C9 \u03BA\u03B1\u1F76 \u1F45\u03C4\u03B1\u03BD \u03C0\u03C1\u1F78\u03C2 \u03C4\u03BF\u1F7A\u03C2\n  \u03BB\u1F79\u03B3\u03BF\u03C5\u03C2 \u03BF\u1F53\u03C2 \u1F00\u03BA\u03BF\u1F7B\u03C9\u0387 \u03C4\u03BF\u1F7A\u03C2 \u03BC\u1F72\u03BD \u03B3\u1F70\u03C1 \u03BB\u1F79\u03B3\u03BF\u03C5\u03C2 \u03C0\u03B5\u03C1\u1F76 \u03C4\u03BF\u1FE6\n  \u03C4\u03B9\u03BC\u03C9\u03C1\u1F75\u03C3\u03B1\u03C3\u03B8\u03B1\u03B9 \u03A6\u1F77\u03BB\u03B9\u03C0\u03C0\u03BF\u03BD \u1F41\u03C1\u1FF6 \u03B3\u03B9\u03B3\u03BD\u03BF\u03BC\u1F73\u03BD\u03BF\u03C5\u03C2, \u03C4\u1F70 \u03B4\u1F72 \u03C0\u03C1\u1F71\u03B3\u03BC\u03B1\u03C4\u1FBF\n  \u03B5\u1F30\u03C2 \u03C4\u03BF\u1FE6\u03C4\u03BF \u03C0\u03C1\u03BF\u1F75\u03BA\u03BF\u03BD\u03C4\u03B1,  \u1F65\u03C3\u03B8\u1FBF \u1F45\u03C0\u03C9\u03C2 \u03BC\u1F74 \u03C0\u03B5\u03B9\u03C3\u1F79\u03BC\u03B5\u03B8\u1FBF \u03B1\u1F50\u03C4\u03BF\u1F76\n  \u03C0\u03C1\u1F79\u03C4\u03B5\u03C1\u03BF\u03BD \u03BA\u03B1\u03BA\u1FF6\u03C2 \u03C3\u03BA\u1F73\u03C8\u03B1\u03C3\u03B8\u03B1\u03B9 \u03B4\u1F73\u03BF\u03BD. \u03BF\u1F50\u03B4\u1F73\u03BD \u03BF\u1F56\u03BD \u1F04\u03BB\u03BB\u03BF \u03BC\u03BF\u03B9 \u03B4\u03BF\u03BA\u03BF\u1FE6\u03C3\u03B9\u03BD\n  \u03BF\u1F31 \u03C4\u1F70 \u03C4\u03BF\u03B9\u03B1\u1FE6\u03C4\u03B1 \u03BB\u1F73\u03B3\u03BF\u03BD\u03C4\u03B5\u03C2 \u1F22 \u03C4\u1F74\u03BD \u1F51\u03C0\u1F79\u03B8\u03B5\u03C3\u03B9\u03BD, \u03C0\u03B5\u03C1\u1F76 \u1F27\u03C2 \u03B2\u03BF\u03C5\u03BB\u03B5\u1F7B\u03B5\u03C3\u03B8\u03B1\u03B9,\n  \u03BF\u1F50\u03C7\u1F76 \u03C4\u1F74\u03BD \u03BF\u1F56\u03C3\u03B1\u03BD \u03C0\u03B1\u03C1\u03B9\u03C3\u03C4\u1F71\u03BD\u03C4\u03B5\u03C2 \u1F51\u03BC\u1FD6\u03BD \u1F01\u03BC\u03B1\u03C1\u03C4\u1F71\u03BD\u03B5\u03B9\u03BD. \u1F10\u03B3\u1F7C \u03B4\u1F73, \u1F45\u03C4\u03B9 \u03BC\u1F73\u03BD\n  \u03C0\u03BF\u03C4\u1FBF \u1F10\u03BE\u1FC6\u03BD \u03C4\u1FC7 \u03C0\u1F79\u03BB\u03B5\u03B9 \u03BA\u03B1\u1F76 \u03C4\u1F70 \u03B1\u1F51\u03C4\u1FC6\u03C2 \u1F14\u03C7\u03B5\u03B9\u03BD \u1F00\u03C3\u03C6\u03B1\u03BB\u1FF6\u03C2 \u03BA\u03B1\u1F76 \u03A6\u1F77\u03BB\u03B9\u03C0\u03C0\u03BF\u03BD\n  \u03C4\u03B9\u03BC\u03C9\u03C1\u1F75\u03C3\u03B1\u03C3\u03B8\u03B1\u03B9, \u03BA\u03B1\u1F76 \u03BC\u1F71\u03BB\u1FBF \u1F00\u03BA\u03C1\u03B9\u03B2\u1FF6\u03C2 \u03BF\u1F36\u03B4\u03B1\u0387 \u1F10\u03C0\u1FBF \u1F10\u03BC\u03BF\u1FE6 \u03B3\u1F71\u03C1, \u03BF\u1F50 \u03C0\u1F71\u03BB\u03B1\u03B9\n  \u03B3\u1F73\u03B3\u03BF\u03BD\u03B5\u03BD \u03C4\u03B1\u1FE6\u03C4\u1FBF \u1F00\u03BC\u03C6\u1F79\u03C4\u03B5\u03C1\u03B1\u0387 \u03BD\u1FE6\u03BD \u03BC\u1F73\u03BD\u03C4\u03BF\u03B9 \u03C0\u1F73\u03C0\u03B5\u03B9\u03C3\u03BC\u03B1\u03B9 \u03C4\u03BF\u1FE6\u03B8\u1FBF \u1F31\u03BA\u03B1\u03BD\u1F78\u03BD\n  \u03C0\u03C1\u03BF\u03BB\u03B1\u03B2\u03B5\u1FD6\u03BD \u1F21\u03BC\u1FD6\u03BD \u03B5\u1F36\u03BD\u03B1\u03B9 \u03C4\u1F74\u03BD \u03C0\u03C1\u1F7D\u03C4\u03B7\u03BD, \u1F45\u03C0\u03C9\u03C2 \u03C4\u03BF\u1F7A\u03C2 \u03C3\u03C5\u03BC\u03BC\u1F71\u03C7\u03BF\u03C5\u03C2\n  \u03C3\u1F7D\u03C3\u03BF\u03BC\u03B5\u03BD. \u1F10\u1F70\u03BD \u03B3\u1F70\u03C1 \u03C4\u03BF\u1FE6\u03C4\u03BF \u03B2\u03B5\u03B2\u03B1\u1F77\u03C9\u03C2 \u1F51\u03C0\u1F71\u03C1\u03BE\u1FC3, \u03C4\u1F79\u03C4\u03B5 \u03BA\u03B1\u1F76 \u03C0\u03B5\u03C1\u1F76 \u03C4\u03BF\u1FE6\n  \u03C4\u1F77\u03BD\u03B1 \u03C4\u03B9\u03BC\u03C9\u03C1\u1F75\u03C3\u03B5\u03C4\u03B1\u1F77 \u03C4\u03B9\u03C2 \u03BA\u03B1\u1F76 \u1F43\u03BD \u03C4\u03C1\u1F79\u03C0\u03BF\u03BD \u1F10\u03BE\u1F73\u03C3\u03C4\u03B1\u03B9 \u03C3\u03BA\u03BF\u03C0\u03B5\u1FD6\u03BD\u0387 \u03C0\u03C1\u1F76\u03BD \u03B4\u1F72\n  \u03C4\u1F74\u03BD \u1F00\u03C1\u03C7\u1F74\u03BD \u1F40\u03C1\u03B8\u1FF6\u03C2 \u1F51\u03C0\u03BF\u03B8\u1F73\u03C3\u03B8\u03B1\u03B9, \u03BC\u1F71\u03C4\u03B1\u03B9\u03BF\u03BD \u1F21\u03B3\u03BF\u1FE6\u03BC\u03B1\u03B9 \u03C0\u03B5\u03C1\u1F76 \u03C4\u1FC6\u03C2\n  \u03C4\u03B5\u03BB\u03B5\u03C5\u03C4\u1FC6\u03C2 \u1F41\u03BD\u03C4\u03B9\u03BD\u03BF\u1FE6\u03BD \u03C0\u03BF\u03B9\u03B5\u1FD6\u03C3\u03B8\u03B1\u03B9 \u03BB\u1F79\u03B3\u03BF\u03BD.\n\n  \u0394\u03B7\u03BC\u03BF\u03C3\u03B8\u1F73\u03BD\u03BF\u03C5\u03C2, \u0393\u1FFD \u1FBF\u039F\u03BB\u03C5\u03BD\u03B8\u03B9\u03B1\u03BA\u1F78\u03C2\n\nGeorgian:\n\n  From a Unicode conference invitation:\n\n  \u10D2\u10D7\u10EE\u10DD\u10D5\u10D7 \u10D0\u10EE\u10DA\u10D0\u10D5\u10D4 \u10D2\u10D0\u10D8\u10D0\u10E0\u10DD\u10D7 \u10E0\u10D4\u10D2\u10D8\u10E1\u10E2\u10E0\u10D0\u10EA\u10D8\u10D0 Unicode-\u10D8\u10E1 \u10DB\u10D4\u10D0\u10D7\u10D4 \u10E1\u10D0\u10D4\u10E0\u10D7\u10D0\u10E8\u10DD\u10E0\u10D8\u10E1\u10DD\n  \u10D9\u10DD\u10DC\u10E4\u10D4\u10E0\u10D4\u10DC\u10EA\u10D8\u10D0\u10D6\u10D4 \u10D3\u10D0\u10E1\u10D0\u10E1\u10EC\u10E0\u10D4\u10D1\u10D0\u10D3, \u10E0\u10DD\u10DB\u10D4\u10DA\u10D8\u10EA \u10D2\u10D0\u10D8\u10DB\u10D0\u10E0\u10D7\u10D4\u10D1\u10D0 10-12 \u10DB\u10D0\u10E0\u10E2\u10E1,\n  \u10E5. \u10DB\u10D0\u10D8\u10DC\u10EA\u10E8\u10D8, \u10D2\u10D4\u10E0\u10DB\u10D0\u10DC\u10D8\u10D0\u10E8\u10D8. \u10D9\u10DD\u10DC\u10E4\u10D4\u10E0\u10D4\u10DC\u10EA\u10D8\u10D0 \u10E8\u10D4\u10F0\u10D9\u10E0\u10D4\u10D1\u10E1 \u10D4\u10E0\u10D7\u10D0\u10D3 \u10DB\u10E1\u10DD\u10E4\u10DA\u10D8\u10DD\u10E1\n  \u10D4\u10E5\u10E1\u10DE\u10D4\u10E0\u10E2\u10D4\u10D1\u10E1 \u10D8\u10E1\u10D4\u10D7 \u10D3\u10D0\u10E0\u10D2\u10D4\u10D1\u10E8\u10D8 \u10E0\u10DD\u10D2\u10DD\u10E0\u10D8\u10EA\u10D0\u10D0 \u10D8\u10DC\u10E2\u10D4\u10E0\u10DC\u10D4\u10E2\u10D8 \u10D3\u10D0 Unicode-\u10D8,\n  \u10D8\u10DC\u10E2\u10D4\u10E0\u10DC\u10D0\u10EA\u10D8\u10DD\u10DC\u10D0\u10DA\u10D8\u10D6\u10D0\u10EA\u10D8\u10D0 \u10D3\u10D0 \u10DA\u10DD\u10D9\u10D0\u10DA\u10D8\u10D6\u10D0\u10EA\u10D8\u10D0, Unicode-\u10D8\u10E1 \u10D2\u10D0\u10DB\u10DD\u10E7\u10D4\u10DC\u10D4\u10D1\u10D0\n  \u10DD\u10DE\u10D4\u10E0\u10D0\u10EA\u10D8\u10E3\u10DA \u10E1\u10D8\u10E1\u10E2\u10D4\u10DB\u10D4\u10D1\u10E1\u10D0, \u10D3\u10D0 \u10D2\u10D0\u10DB\u10DD\u10E7\u10D4\u10DC\u10D4\u10D1\u10D8\u10D7 \u10DE\u10E0\u10DD\u10D2\u10E0\u10D0\u10DB\u10D4\u10D1\u10E8\u10D8, \u10E8\u10E0\u10D8\u10E4\u10E2\u10D4\u10D1\u10E8\u10D8,\n  \u10E2\u10D4\u10E5\u10E1\u10E2\u10D4\u10D1\u10D8\u10E1 \u10D3\u10D0\u10DB\u10E3\u10E8\u10D0\u10D5\u10D4\u10D1\u10D0\u10E1\u10D0 \u10D3\u10D0 \u10DB\u10E0\u10D0\u10D5\u10D0\u10DA\u10D4\u10DC\u10DD\u10D5\u10D0\u10DC \u10D9\u10DD\u10DB\u10DE\u10D8\u10E3\u10E2\u10D4\u10E0\u10E3\u10DA \u10E1\u10D8\u10E1\u10E2\u10D4\u10DB\u10D4\u10D1\u10E8\u10D8.\n\nRussian:\n\n  From a Unicode conference invitation:\n\n  \u0417\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u0443\u0439\u0442\u0435\u0441\u044C \u0441\u0435\u0439\u0447\u0430\u0441 \u043D\u0430 \u0414\u0435\u0441\u044F\u0442\u0443\u044E \u041C\u0435\u0436\u0434\u0443\u043D\u0430\u0440\u043E\u0434\u043D\u0443\u044E \u041A\u043E\u043D\u0444\u0435\u0440\u0435\u043D\u0446\u0438\u044E \u043F\u043E\n  Unicode, \u043A\u043E\u0442\u043E\u0440\u0430\u044F \u0441\u043E\u0441\u0442\u043E\u0438\u0442\u0441\u044F 10-12 \u043C\u0430\u0440\u0442\u0430 1997 \u0433\u043E\u0434\u0430 \u0432 \u041C\u0430\u0439\u043D\u0446\u0435 \u0432 \u0413\u0435\u0440\u043C\u0430\u043D\u0438\u0438.\n  \u041A\u043E\u043D\u0444\u0435\u0440\u0435\u043D\u0446\u0438\u044F \u0441\u043E\u0431\u0435\u0440\u0435\u0442 \u0448\u0438\u0440\u043E\u043A\u0438\u0439 \u043A\u0440\u0443\u0433 \u044D\u043A\u0441\u043F\u0435\u0440\u0442\u043E\u0432 \u043F\u043E  \u0432\u043E\u043F\u0440\u043E\u0441\u0430\u043C \u0433\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u043E\u0433\u043E\n  \u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442\u0430 \u0438 Unicode, \u043B\u043E\u043A\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u0438 \u0438 \u0438\u043D\u0442\u0435\u0440\u043D\u0430\u0446\u0438\u043E\u043D\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u0438, \u0432\u043E\u043F\u043B\u043E\u0449\u0435\u043D\u0438\u044E \u0438\n  \u043F\u0440\u0438\u043C\u0435\u043D\u0435\u043D\u0438\u044E Unicode \u0432 \u0440\u0430\u0437\u043B\u0438\u0447\u043D\u044B\u0445 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0445 \u0438 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u043D\u044B\u0445\n  \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F\u0445, \u0448\u0440\u0438\u0444\u0442\u0430\u0445, \u0432\u0435\u0440\u0441\u0442\u043A\u0435 \u0438 \u043C\u043D\u043E\u0433\u043E\u044F\u0437\u044B\u0447\u043D\u044B\u0445 \u043A\u043E\u043C\u043F\u044C\u044E\u0442\u0435\u0440\u043D\u044B\u0445 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\u0445.\n\nThai (UCS Level 2):\n\n  Excerpt from a poetry on The Romance of The Three Kingdoms (a Chinese\n  classic 'San Gua'):\n\n  [----------------------------|------------------------]\n    \u0E4F \u0E41\u0E1C\u0E48\u0E19\u0E14\u0E34\u0E19\u0E2E\u0E31\u0E48\u0E19\u0E40\u0E2A\u0E37\u0E48\u0E2D\u0E21\u0E42\u0E17\u0E23\u0E21\u0E41\u0E2A\u0E19\u0E2A\u0E31\u0E07\u0E40\u0E27\u0E0A  \u0E1E\u0E23\u0E30\u0E1B\u0E01\u0E40\u0E01\u0E28\u0E01\u0E2D\u0E07\u0E1A\u0E39\u0E4A\u0E01\u0E39\u0E49\u0E02\u0E36\u0E49\u0E19\u0E43\u0E2B\u0E21\u0E48\n  \u0E2A\u0E34\u0E1A\u0E2A\u0E2D\u0E07\u0E01\u0E29\u0E31\u0E15\u0E23\u0E34\u0E22\u0E4C\u0E01\u0E48\u0E2D\u0E19\u0E2B\u0E19\u0E49\u0E32\u0E41\u0E25\u0E16\u0E31\u0E14\u0E44\u0E1B       \u0E2A\u0E2D\u0E07\u0E2D\u0E07\u0E04\u0E4C\u0E44\u0E0B\u0E23\u0E49\u0E42\u0E07\u0E48\u0E40\u0E02\u0E25\u0E32\u0E40\u0E1A\u0E32\u0E1B\u0E31\u0E0D\u0E0D\u0E32\n    \u0E17\u0E23\u0E07\u0E19\u0E31\u0E1A\u0E16\u0E37\u0E2D\u0E02\u0E31\u0E19\u0E17\u0E35\u0E40\u0E1B\u0E47\u0E19\u0E17\u0E35\u0E48\u0E1E\u0E36\u0E48\u0E07           \u0E1A\u0E49\u0E32\u0E19\u0E40\u0E21\u0E37\u0E2D\u0E07\u0E08\u0E36\u0E07\u0E27\u0E34\u0E1B\u0E23\u0E34\u0E15\u0E40\u0E1B\u0E47\u0E19\u0E19\u0E31\u0E01\u0E2B\u0E19\u0E32\n  \u0E42\u0E2E\u0E08\u0E34\u0E4B\u0E19\u0E40\u0E23\u0E35\u0E22\u0E01\u0E17\u0E31\u0E1E\u0E17\u0E31\u0E48\u0E27\u0E2B\u0E31\u0E27\u0E40\u0E21\u0E37\u0E2D\u0E07\u0E21\u0E32         \u0E2B\u0E21\u0E32\u0E22\u0E08\u0E30\u0E06\u0E48\u0E32\u0E21\u0E14\u0E0A\u0E31\u0E48\u0E27\u0E15\u0E31\u0E27\u0E2A\u0E33\u0E04\u0E31\u0E0D\n    \u0E40\u0E2B\u0E21\u0E37\u0E2D\u0E19\u0E02\u0E31\u0E1A\u0E44\u0E2A\u0E44\u0E25\u0E48\u0E40\u0E2A\u0E37\u0E2D\u0E08\u0E32\u0E01\u0E40\u0E04\u0E2B\u0E32      \u0E23\u0E31\u0E1A\u0E2B\u0E21\u0E32\u0E1B\u0E48\u0E32\u0E40\u0E02\u0E49\u0E32\u0E21\u0E32\u0E40\u0E25\u0E22\u0E2D\u0E32\u0E2A\u0E31\u0E0D\n  \u0E1D\u0E48\u0E32\u0E22\u0E2D\u0E49\u0E2D\u0E07\u0E2D\u0E38\u0E49\u0E19\u0E22\u0E38\u0E41\u0E22\u0E01\u0E43\u0E2B\u0E49\u0E41\u0E15\u0E01\u0E01\u0E31\u0E19          \u0E43\u0E0A\u0E49\u0E2A\u0E32\u0E27\u0E19\u0E31\u0E49\u0E19\u0E40\u0E1B\u0E47\u0E19\u0E0A\u0E19\u0E27\u0E19\u0E0A\u0E37\u0E48\u0E19\u0E0A\u0E27\u0E19\u0E43\u0E08\n    \u0E1E\u0E25\u0E31\u0E19\u0E25\u0E34\u0E09\u0E38\u0E22\u0E01\u0E38\u0E22\u0E01\u0E35\u0E01\u0E25\u0E31\u0E1A\u0E01\u0E48\u0E2D\u0E40\u0E2B\u0E15\u0E38          \u0E0A\u0E48\u0E32\u0E07\u0E2D\u0E32\u0E40\u0E1E\u0E28\u0E08\u0E23\u0E34\u0E07\u0E2B\u0E19\u0E32\u0E1F\u0E49\u0E32\u0E23\u0E49\u0E2D\u0E07\u0E44\u0E2B\u0E49\n  \u0E15\u0E49\u0E2D\u0E07\u0E23\u0E1A\u0E23\u0E32\u0E06\u0E48\u0E32\u0E1F\u0E31\u0E19\u0E08\u0E19\u0E1A\u0E23\u0E23\u0E25\u0E31\u0E22           \u0E24\u0E45\u0E2B\u0E32\u0E43\u0E04\u0E23\u0E04\u0E49\u0E33\u0E0A\u0E39\u0E01\u0E39\u0E49\u0E1A\u0E23\u0E23\u0E25\u0E31\u0E07\u0E01\u0E4C \u0E2F\n\n  (The above is a two-column text. If combining characters are handled\n  correctly, the lines of the second column should be aligned with the\n  | character above.)\n\nEthiopian:\n\n  Proverbs in the Amharic language:\n\n  \u1230\u121B\u12ED \u12A0\u12ED\u1273\u1228\u1235 \u1295\u1309\u1225 \u12A0\u12ED\u12A8\u1230\u1235\u1362\n  \u1265\u120B \u12AB\u1208\u129D \u12A5\u1295\u12F0\u12A0\u1263\u1274 \u1260\u1246\u1218\u1320\u129D\u1362\n  \u130C\u1325 \u12EB\u1208\u1264\u1271 \u1241\u121D\u1325\u1293 \u1290\u12CD\u1362\n  \u12F0\u1200 \u1260\u1215\u120D\u1219 \u1245\u1264 \u1263\u12ED\u1320\u1323 \u1295\u1323\u1275 \u1260\u1308\u12F0\u1208\u12CD\u1362\n  \u12E8\u12A0\u134D \u12C8\u1208\u121D\u1273 \u1260\u1245\u1264 \u12A0\u12ED\u1273\u123D\u121D\u1362\n  \u12A0\u12ED\u1325 \u1260\u1260\u120B \u12F3\u12CB \u1270\u1218\u1273\u1362\n  \u1232\u1270\u1228\u1309\u1219 \u12ED\u12F0\u1228\u130D\u1219\u1362\n  \u1240\u1235 \u1260\u1240\u1235\u1365 \u12D5\u1295\u1241\u120B\u120D \u1260\u12A5\u130D\u1229 \u12ED\u1204\u12F3\u120D\u1362\n  \u12F5\u122D \u1262\u12EB\u1265\u122D \u12A0\u1295\u1260\u1233 \u12EB\u1235\u122D\u1362\n  \u1230\u12CD \u12A5\u1295\u12F0\u1264\u1271 \u12A5\u1295\u1305 \u12A5\u1295\u12F0 \u1309\u1228\u1264\u1271 \u12A0\u12ED\u1270\u12F3\u12F0\u122D\u121D\u1362\n  \u12A5\u130D\u12DC\u122D \u12E8\u12A8\u1348\u1270\u12CD\u1295 \u1309\u122E\u122E \u1233\u12ED\u12D8\u130B\u12CD \u12A0\u12ED\u12F5\u122D\u121D\u1362\n  \u12E8\u130E\u1228\u1264\u1275 \u120C\u1263\u1365 \u1262\u12EB\u12E9\u1275 \u12ED\u1235\u1245 \u1263\u12EB\u12E9\u1275 \u12EB\u1320\u120D\u1245\u1362\n  \u1225\u122B \u12A8\u1218\u134D\u1273\u1275 \u120D\u1304\u1295 \u120B\u134B\u1273\u1275\u1362\n  \u12D3\u1263\u12ED \u121B\u12F0\u122A\u12EB \u12E8\u1208\u12CD\u1365 \u130D\u1295\u12F5 \u12ED\u12DE \u12ED\u12DE\u122B\u120D\u1362\n  \u12E8\u12A5\u1235\u120B\u121D \u12A0\u1308\u1229 \u1218\u12AB \u12E8\u12A0\u121E\u122B \u12A0\u1308\u1229 \u12CB\u122D\u12AB\u1362\n  \u1270\u1295\u130B\u120E \u1262\u1270\u1349 \u1270\u1218\u120D\u1236 \u1263\u1349\u1362\n  \u12C8\u12F3\u1305\u1205 \u121B\u122D \u1262\u1206\u1295 \u1328\u122D\u1235\u1205 \u12A0\u1275\u120B\u1230\u12CD\u1362\n  \u12A5\u130D\u122D\u1205\u1295 \u1260\u134D\u122B\u123D\u1205 \u120D\u12AD \u12D8\u122D\u130B\u1362\n\nRunes:\n\n  \u16BB\u16D6 \u16B3\u16B9\u16AB\u16A6 \u16A6\u16AB\u16CF \u16BB\u16D6 \u16D2\u16A2\u16DE\u16D6 \u16A9\u16BE \u16A6\u16AB\u16D7 \u16DA\u16AA\u16BE\u16DE\u16D6 \u16BE\u16A9\u16B1\u16A6\u16B9\u16D6\u16AA\u16B1\u16DE\u16A2\u16D7 \u16B9\u16C1\u16A6 \u16A6\u16AA \u16B9\u16D6\u16E5\u16AB\n\n  (Old English, which transcribed into Latin reads 'He cwaeth that he\n  bude thaem lande northweardum with tha Westsae.' and means 'He said\n  that he lived in the northern land near the Western Sea.')\n\nBraille:\n\n  \u284C\u2801\u2827\u2811 \u283C\u2801\u2812  \u284D\u281C\u2807\u2811\u2839\u2830\u280E \u2863\u2815\u280C\n\n  \u284D\u281C\u2807\u2811\u2839 \u283A\u2801\u280E \u2819\u2811\u2801\u2819\u2812 \u281E\u2815 \u2803\u2811\u281B\u2814 \u283A\u280A\u2839\u2832 \u2879\u283B\u2811 \u280A\u280E \u281D\u2815 \u2819\u2833\u2803\u281E\n  \u2831\u2801\u281E\u2811\u2827\u283B \u2801\u2803\u2833\u281E \u2839\u2801\u281E\u2832 \u2879\u2811 \u2817\u2811\u281B\u280A\u280C\u283B \u2815\u280B \u2819\u280A\u280E \u2803\u2825\u2817\u280A\u2801\u2807 \u283A\u2801\u280E\n  \u280E\u280A\u281B\u281D\u282B \u2803\u2839 \u2839\u2811 \u280A\u2807\u283B\u281B\u2839\u280D\u2801\u281D\u2802 \u2839\u2811 \u280A\u2807\u283B\u2805\u2802 \u2839\u2811 \u2825\u281D\u2819\u283B\u281E\u2801\u2805\u283B\u2802\n  \u2801\u281D\u2819 \u2839\u2811 \u2821\u280A\u2811\u280B \u280D\u2833\u2817\u281D\u283B\u2832 \u284E\u280A\u2817\u2815\u2815\u281B\u2811 \u280E\u280A\u281B\u281D\u282B \u280A\u281E\u2832 \u2841\u281D\u2819\n  \u284E\u280A\u2817\u2815\u2815\u281B\u2811\u2830\u280E \u281D\u2801\u280D\u2811 \u283A\u2801\u280E \u281B\u2815\u2815\u2819 \u2825\u280F\u2815\u281D \u2830\u2861\u2801\u281D\u281B\u2811\u2802 \u280B\u2815\u2817 \u2801\u281D\u2839\u2839\u2814\u281B \u2819\u2811\n  \u2821\u2815\u280E\u2811 \u281E\u2815 \u280F\u2825\u281E \u2819\u280A\u280E \u2819\u2801\u281D\u2819 \u281E\u2815\u2832\n\n  \u2855\u2807\u2819 \u284D\u281C\u2807\u2811\u2839 \u283A\u2801\u280E \u2801\u280E \u2819\u2811\u2801\u2819 \u2801\u280E \u2801 \u2819\u2815\u2815\u2817\u2824\u281D\u2801\u280A\u2807\u2832\n\n  \u284D\u2814\u2819\u2816 \u284A \u2819\u2815\u281D\u2830\u281E \u280D\u2811\u2801\u281D \u281E\u2815 \u280E\u2801\u2839 \u2839\u2801\u281E \u284A \u2805\u281D\u282A\u2802 \u2815\u280B \u280D\u2839\n  \u282A\u281D \u2805\u281D\u282A\u2807\u282B\u281B\u2811\u2802 \u2831\u2801\u281E \u2839\u283B\u2811 \u280A\u280E \u280F\u281C\u281E\u280A\u280A\u2825\u2807\u281C\u2807\u2839 \u2819\u2811\u2801\u2819 \u2801\u2803\u2833\u281E\n  \u2801 \u2819\u2815\u2815\u2817\u2824\u281D\u2801\u280A\u2807\u2832 \u284A \u280D\u280A\u2823\u281E \u2819\u2801\u2827\u2811 \u2803\u2811\u2832 \u2814\u280A\u2807\u2814\u282B\u2802 \u280D\u2839\u280E\u2811\u2807\u280B\u2802 \u281E\u2815\n  \u2817\u2811\u281B\u281C\u2819 \u2801 \u280A\u2815\u280B\u280B\u2814\u2824\u281D\u2801\u280A\u2807 \u2801\u280E \u2839\u2811 \u2819\u2811\u2801\u2819\u2811\u280C \u280F\u280A\u2811\u280A\u2811 \u2815\u280B \u280A\u2817\u2815\u281D\u280D\u2815\u281D\u281B\u283B\u2839\n  \u2814 \u2839\u2811 \u281E\u2817\u2801\u2819\u2811\u2832 \u2843\u2825\u281E \u2839\u2811 \u283A\u280A\u280E\u2819\u2815\u280D \u2815\u280B \u2833\u2817 \u2801\u281D\u280A\u2811\u280C\u2815\u2817\u280E\n  \u280A\u280E \u2814 \u2839\u2811 \u280E\u280A\u280D\u280A\u2807\u2811\u2806 \u2801\u281D\u2819 \u280D\u2839 \u2825\u281D\u2819\u2801\u2807\u2807\u282A\u282B \u2819\u2801\u281D\u2819\u280E\n  \u2829\u2801\u2807\u2807 \u281D\u2815\u281E \u2819\u280A\u280C\u2825\u2817\u2803 \u280A\u281E\u2802 \u2815\u2817 \u2839\u2811 \u284A\u2833\u281D\u281E\u2817\u2839\u2830\u280E \u2819\u2815\u281D\u2811 \u280B\u2815\u2817\u2832 \u2879\u2833\n  \u283A\u280A\u2807\u2807 \u2839\u283B\u2811\u280B\u2815\u2817\u2811 \u280F\u283B\u280D\u280A\u281E \u280D\u2811 \u281E\u2815 \u2817\u2811\u280F\u2811\u2801\u281E\u2802 \u2811\u280D\u280F\u2819\u2801\u281E\u280A\u280A\u2801\u2807\u2807\u2839\u2802 \u2839\u2801\u281E\n  \u284D\u281C\u2807\u2811\u2839 \u283A\u2801\u280E \u2801\u280E \u2819\u2811\u2801\u2819 \u2801\u280E \u2801 \u2819\u2815\u2815\u2817\u2824\u281D\u2801\u280A\u2807\u2832\n\n  (The first couple of paragraphs of \"A Christmas Carol\" by Dickens)\n\nCompact font selection example text:\n\n  ABCDEFGHIJKLMNOPQRSTUVWXYZ /0123456789\n  abcdefghijklmnopqrstuvwxyz \u00A3\u00A9\u00B5\u00C0\u00C6\u00D6\u00DE\u00DF\u00E9\u00F6\u00FF\n  \u2013\u2014\u2018\u201C\u201D\u201E\u2020\u2022\u2026\u2030\u2122\u0153\u0160\u0178\u017E\u20AC \u0391\u0392\u0393\u0394\u03A9\u03B1\u03B2\u03B3\u03B4\u03C9 \u0410\u0411\u0412\u0413\u0414\u0430\u0431\u0432\u0433\u0434\n  \u2200\u2202\u2208\u211D\u2227\u222A\u2261\u221E \u2191\u2197\u21A8\u21BB\u21E3 \u2510\u253C\u2554\u2558\u2591\u25BA\u263A\u2640 \uFB01\uFFFD\u2440\u2082\u1F20\u1E02\u04E5\u1E84\u0250\u02D0\u234E\u05D0\u0531\u10D0\n\nGreetings in various languages:\n\n  Hello world, \u039A\u03B1\u03BB\u03B7\u03BC\u1F73\u03C1\u03B1 \u03BA\u1F79\u03C3\u03BC\u03B5, \u30B3\u30F3\u30CB\u30C1\u30CF\n\nBox drawing alignment tests:                                          \u2588\n                                                                      \u2589\n  \u2554\u2550\u2550\u2566\u2550\u2550\u2557  \u250C\u2500\u2500\u252C\u2500\u2500\u2510  \u256D\u2500\u2500\u252C\u2500\u2500\u256E  \u256D\u2500\u2500\u252C\u2500\u2500\u256E  \u250F\u2501\u2501\u2533\u2501\u2501\u2513  \u250E\u2512\u250F\u2511   \u2577  \u257B \u250F\u252F\u2513 \u250C\u2530\u2510    \u258A \u2571\u2572\u2571\u2572\u2573\u2573\u2573\n  \u2551\u250C\u2500\u2568\u2500\u2510\u2551  \u2502\u2554\u2550\u2567\u2550\u2557\u2502  \u2502\u2552\u2550\u256A\u2550\u2555\u2502  \u2502\u2553\u2500\u2541\u2500\u2556\u2502  \u2503\u250C\u2500\u2542\u2500\u2510\u2503  \u2517\u2543\u2544\u2519  \u2576\u253C\u2574\u257A\u254B\u2578\u2520\u253C\u2528 \u251D\u254B\u2525    \u258B \u2572\u2571\u2572\u2571\u2573\u2573\u2573\n  \u2551\u2502\u2572 \u2571\u2502\u2551  \u2502\u2551   \u2551\u2502  \u2502\u2502 \u2502 \u2502\u2502  \u2502\u2551 \u2503 \u2551\u2502  \u2503\u2502 \u257F \u2502\u2503  \u250D\u2545\u2546\u2513   \u2575  \u2579 \u2517\u2537\u251B \u2514\u2538\u2518    \u258C \u2571\u2572\u2571\u2572\u2573\u2573\u2573\n  \u2560\u2561 \u2573 \u255E\u2563  \u251C\u2562   \u255F\u2524  \u251C\u253C\u2500\u253C\u2500\u253C\u2524  \u251C\u256B\u2500\u2542\u2500\u256B\u2524  \u2523\u253F\u257E\u253C\u257C\u253F\u252B  \u2515\u251B\u2516\u251A     \u250C\u2504\u2504\u2510 \u254E \u250F\u2505\u2505\u2513 \u250B \u258D \u2572\u2571\u2572\u2571\u2573\u2573\u2573\n  \u2551\u2502\u2571 \u2572\u2502\u2551  \u2502\u2551   \u2551\u2502  \u2502\u2502 \u2502 \u2502\u2502  \u2502\u2551 \u2503 \u2551\u2502  \u2503\u2502 \u257D \u2502\u2503  \u2591\u2591\u2592\u2592\u2593\u2593\u2588\u2588 \u250A  \u2506 \u254E \u254F  \u2507 \u250B \u258E\n  \u2551\u2514\u2500\u2565\u2500\u2518\u2551  \u2502\u255A\u2550\u2564\u2550\u255D\u2502  \u2502\u2558\u2550\u256A\u2550\u255B\u2502  \u2502\u2559\u2500\u2540\u2500\u255C\u2502  \u2503\u2514\u2500\u2542\u2500\u2518\u2503  \u2591\u2591\u2592\u2592\u2593\u2593\u2588\u2588 \u250A  \u2506 \u254E \u254F  \u2507 \u250B \u258F\n  \u255A\u2550\u2550\u2569\u2550\u2550\u255D  \u2514\u2500\u2500\u2534\u2500\u2500\u2518  \u2570\u2500\u2500\u2534\u2500\u2500\u256F  \u2570\u2500\u2500\u2534\u2500\u2500\u256F  \u2517\u2501\u2501\u253B\u2501\u2501\u251B  \u2597\u2584\u2596\u259B\u2580\u259C   \u2514\u254C\u254C\u2518 \u254E \u2517\u254D\u254D\u251B \u250B  \u2581\u2582\u2583\u2584\u2585\u2586\u2587\u2588\n                                               \u259D\u2580\u2598\u2599\u2584\u259F\n" .
-<http://drobilla.net/sw/serd/tests/good/UTF-8.ttl> <http://www.w3.org/2000/01/rdf-schema#comment> "\n  Two byte Unicode escape: \u00E0\n  Largest Unicode escape in Turtle: \U0010FFFF\n" .
diff --git a/tests/good/base.nt b/tests/good/base.nt
deleted file mode 100644
index 10015be1..00000000
--- a/tests/good/base.nt
+++ /dev/null
@@ -1 +0,0 @@
-<http://drobilla.net/sw/serd/tests/good/foo> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://drobilla.net/sw/serd/tests/good/Bar> .
diff --git a/tests/good/test-rel.nt b/tests/good/test-rel.nt
deleted file mode 100644
index f1fca1c2..00000000
--- a/tests/good/test-rel.nt
+++ /dev/null
@@ -1,6 +0,0 @@
-<http://drobilla.net/sw/serd/tests/good/a/b/c> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
-<http://drobilla.net/sw/serd/tests> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
-<http://drobilla.net/sw/serd/tests/good/test-rel.ttl> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
-<http://drobilla.net/sw/serd/tests/good/test-not.ttl> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
-<http://drobilla.net/sw/serd/tests/good/a/b/c> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
-<http://www.w3.org/> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Thing> .
diff --git a/tests/good/test-rel.ttl b/tests/good/test-rel.ttl
deleted file mode 100644
index 363b3e1c..00000000
--- a/tests/good/test-rel.ttl
+++ /dev/null
@@ -1,6 +0,0 @@
-<http://drobilla.net/sw/serd/tests/good/a/b/c> a <http://example.org/Thing> .
-<http://drobilla.net/sw/serd/tests> a <http://example.org/Thing> .
-<http://drobilla.net/sw/serd/tests/good/test-rel.ttl> a <http://example.org/Thing> .
-<http://drobilla.net/sw/serd/tests/good/test-not.ttl> a <http://example.org/Thing> .
-<a/b/c> a <http://example.org/Thing> .
-<http://www.w3.org/> a <http://example.org/Thing> .
diff --git a/wscript b/wscript
index b8c75465..7a6bd52c 100644
--- a/wscript
+++ b/wscript
@@ -11,7 +11,7 @@ from waflib.extras import autowaf
 # major increment <=> incompatible changes
 # minor increment <=> compatible changes (additions)
 # micro increment <=> no interface changes
-SERD_VERSION       = '0.30.6'
+SERD_VERSION       = '0.30.7'
 SERD_MAJOR_VERSION = '0'
 
 # Mandatory waf variables
@@ -211,10 +211,10 @@ def build(bld):
 
         # Test programs
         for prog in [('serdi_static', 'src/serdi.c'),
-                     ('env_test', 'tests/env_test.c'),
-                     ('free_null_test', 'tests/free_null_test.c'),
-                     ('read_chunk_test', 'tests/read_chunk_test.c'),
-                     ('serd_test', 'tests/serd_test.c')]:
+                     ('env_test', 'test/env_test.c'),
+                     ('free_null_test', 'test/free_null_test.c'),
+                     ('read_chunk_test', 'test/read_chunk_test.c'),
+                     ('serd_test', 'test/serd_test.c')]:
             bld(features     = 'c cprogram',
                 source       = prog[1],
                 use          = 'libserd_profiled',
@@ -284,7 +284,7 @@ def lint(ctx):
 
     if "CLANG_TIDY" in ctx.env and "clang" in ctx.env.CC[0]:
         Logs.info("Running clang-tidy")
-        sources = glob.glob('src/*.c') + glob.glob('tests/*.c')
+        sources = glob.glob('src/*.c') + glob.glob('test/*.c')
         sources = list(map(os.path.abspath, sources))
         procs = []
         for source in sources:
@@ -460,7 +460,7 @@ def test_suite(ctx, base_uri, testdir, report, isyntax, options=[]):
     srcdir = ctx.path.abspath()
 
     mf = 'http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#'
-    manifest_path = os.path.join(srcdir, 'tests', testdir, 'manifest.ttl')
+    manifest_path = os.path.join(srcdir, 'test', testdir, 'manifest.ttl')
     model, instances = _load_rdf(manifest_path)
 
     asserter = ''
@@ -476,7 +476,7 @@ def test_suite(ctx, base_uri, testdir, report, isyntax, options=[]):
             for test in sorted(tests):
                 action_node = model[test][mf + 'action'][0]
                 basename    = os.path.basename(action_node)
-                action      = os.path.join('tests', testdir, basename)
+                action      = os.path.join('test', testdir, basename)
                 rel_action  = os.path.join(os.path.relpath(srcdir), action)
                 uri         = base_uri + os.path.basename(action)
                 command     = [serdi] + options + ['-f', rel_action, uri]
@@ -525,7 +525,7 @@ def test(tst):
     for i in ['bad', 'good', 'lax',
               'TurtleTests', 'NTriplesTests', 'NQuadsTests', 'TriGTests']:
         try:
-            test_dir = os.path.join('tests', i)
+            test_dir = os.path.join('test', i)
             os.makedirs(test_dir)
             for i in glob.glob(test_dir + '/*.*'):
                 os.remove(i)
@@ -541,9 +541,9 @@ def test(tst):
         check(['./serd_test'])
 
     def test_syntax_io(check, in_name, check_name, lang):
-        in_path = 'tests/good/%s' % in_name
+        in_path = 'test/good/%s' % in_name
         out_path = in_path + '.io'
-        check_path = '%s/tests/good/%s' % (srcdir, check_name)
+        check_path = '%s/test/good/%s' % (srcdir, check_name)
 
         check([serdi, '-o', lang, '%s/%s' % (srcdir, in_path), in_path],
               stdout=out_path, name=in_name)
@@ -555,7 +555,7 @@ def test(tst):
         test_syntax_io(check, 'qualify-in.ttl', 'qualify-out.ttl', 'turtle')
 
     with tst.group('GoodCommands') as check:
-        check([serdi, '%s/tests/good/manifest.ttl' % srcdir])
+        check([serdi, '%s/test/good/manifest.ttl' % srcdir])
         check([serdi, '-v'])
         check([serdi, '-h'])
         check([serdi, '-s', '<foo> a <#Thingie> .'])
@@ -576,7 +576,7 @@ def test(tst):
         check([serdi, '-o', 'illegal'])
         check([serdi, '-o'])
         check([serdi, '-p'])
-        check([serdi, '-q', '%s/tests/bad/bad-base.ttl' % srcdir], stderr=None)
+        check([serdi, '-q', '%s/test/bad/bad-base.ttl' % srcdir], stderr=None)
         check([serdi, '-r'])
         check([serdi, '-z'])
 
@@ -584,7 +584,7 @@ def test(tst):
         check([serdi, '-e', 'file://%s/' % srcdir], name='Read directory')
         check([serdi, 'file://%s/' % srcdir], name='Bulk read directory')
         if os.path.exists('/dev/full'):
-            check([serdi, 'file://%s/tests/good/manifest.ttl' % srcdir],
+            check([serdi, 'file://%s/test/good/manifest.ttl' % srcdir],
                   stdout='/dev/full', name='Write error')
 
     if sys.version_info.major >= 3:
@@ -609,7 +609,7 @@ def test(tst):
             Logs.warn('Failed to import rdflib, not running NEWS tests')
 
     # Serd-specific test suites
-    serd_base = 'http://drobilla.net/sw/serd/tests/'
+    serd_base = 'http://drobilla.net/sw/serd/test/'
     test_suite(tst, serd_base + 'good/', 'good', None, 'Turtle')
     test_suite(tst, serd_base + 'bad/', 'bad', None, 'Turtle')
     test_suite(tst, serd_base + 'lax/', 'lax', None, 'Turtle', ['-l'])