Separate test suites and simplify licensing metadata

1227 files changed, 28 insertions, 29 deletions

diff --git a/.reuse/dep5 b/.reuse/dep5
index ecd40484..3173226a 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -3,14 +3,14 @@ Upstream-Name: serd
 Upstream-Contact: David Robillard <d@drobilla.net>
 Source: https://gitlab.com/drobilla/serd
 
-Files: test/NQuadsTests/*.nq test/NQuadsTests/README test/NQuadsTests/manifest.ttl test/NTriplesTests/*.nt test/NTriplesTests/README test/NTriplesTests/manifest.ttl test/TriGTests/*.nq test/TriGTests/*.trig test/TriGTests/README test/TriGTests/manifest.ttl test/TurtleTests/*.nt test/TurtleTests/*.ttl test/TurtleTests/README
+Files: test/w3c/*
 Copyright: 2010 World Wide Web Consortium, (MIT, ERCIM, Keio, Beihang) and others.
-Comment: Standard test suites from the W3C (only required for testing)
+Comment: Standard test suites from the W3C
 License: BSD-3-Clause
 
-Files: test/bad/* test/full/* test/good/* test/lax/* test/qualify/* test/root/* test/prefix/* test/pretty/*
+Files: test/extra/*
 Copyright: 2011-2023 David Robillard <d@drobilla.net>
-Comment: Extra tests for serd (potential contributions to the W3C suites)
+Comment: Extra test suites for serd
 License: BSD-3-Clause OR ISC
 
 Files: AUTHORS NEWS serd.ttl
diff --git a/test/bad/bad-00.ttl b/test/extra/bad/bad-00.ttl
index b1a1b361..b1a1b361 100644
--- a/test/bad/bad-00.ttl
+++ b/test/extra/bad/bad-00.ttl
diff --git a/test/bad/bad-01.ttl b/test/extra/bad/bad-01.ttl
index 533bc21d..533bc21d 100644
--- a/test/bad/bad-01.ttl
+++ b/test/extra/bad/bad-01.ttl
diff --git a/test/bad/bad-02.ttl b/test/extra/bad/bad-02.ttl
index fd2014d0..fd2014d0 100644
--- a/test/bad/bad-02.ttl
+++ b/test/extra/bad/bad-02.ttl
diff --git a/test/bad/bad-03.ttl b/test/extra/bad/bad-03.ttl
index 07a372f1..07a372f1 100644
--- a/test/bad/bad-03.ttl
+++ b/test/extra/bad/bad-03.ttl
diff --git a/test/bad/bad-04.ttl b/test/extra/bad/bad-04.ttl
index ee7246c8..ee7246c8 100644
--- a/test/bad/bad-04.ttl
+++ b/test/extra/bad/bad-04.ttl
diff --git a/test/bad/bad-05.ttl b/test/extra/bad/bad-05.ttl
index 387015fe..387015fe 100644
--- a/test/bad/bad-05.ttl
+++ b/test/extra/bad/bad-05.ttl
diff --git a/test/bad/bad-06.ttl b/test/extra/bad/bad-06.ttl
index a8f1a0fc..a8f1a0fc 100644
--- a/test/bad/bad-06.ttl
+++ b/test/extra/bad/bad-06.ttl
diff --git a/test/bad/bad-07.ttl b/test/extra/bad/bad-07.ttl
index 18ea4fa6..18ea4fa6 100644
--- a/test/bad/bad-07.ttl
+++ b/test/extra/bad/bad-07.ttl
diff --git a/test/bad/bad-08.ttl b/test/extra/bad/bad-08.ttl
index 07918f9a..07918f9a 100644
--- a/test/bad/bad-08.ttl
+++ b/test/extra/bad/bad-08.ttl
diff --git a/test/bad/bad-09.ttl b/test/extra/bad/bad-09.ttl
index d2d76c13..d2d76c13 100644
--- a/test/bad/bad-09.ttl
+++ b/test/extra/bad/bad-09.ttl
diff --git a/test/bad/bad-10.ttl b/test/extra/bad/bad-10.ttl
index b5ef1f55..b5ef1f55 100644
--- a/test/bad/bad-10.ttl
+++ b/test/extra/bad/bad-10.ttl
diff --git a/test/bad/bad-11.ttl b/test/extra/bad/bad-11.ttl
index 09e7b6a0..09e7b6a0 100644
--- a/test/bad/bad-11.ttl
+++ b/test/extra/bad/bad-11.ttl
diff --git a/test/bad/bad-12.ttl b/test/extra/bad/bad-12.ttl
index cef48ff8..cef48ff8 100644
--- a/test/bad/bad-12.ttl
+++ b/test/extra/bad/bad-12.ttl
diff --git a/test/bad/bad-13.ttl b/test/extra/bad/bad-13.ttl
index 91accf2b..91accf2b 100644
--- a/test/bad/bad-13.ttl
+++ b/test/extra/bad/bad-13.ttl
diff --git a/test/bad/bad-14.ttl b/test/extra/bad/bad-14.ttl
index f4a7acf5..f4a7acf5 100644
--- a/test/bad/bad-14.ttl
+++ b/test/extra/bad/bad-14.ttl
diff --git a/test/bad/bad-base.ttl b/test/extra/bad/bad-base.ttl
index 85421999..85421999 100644
--- a/test/bad/bad-base.ttl
+++ b/test/extra/bad/bad-base.ttl
diff --git a/test/bad/bad-blank-syntax.ttl b/test/extra/bad/bad-blank-syntax.ttl
index 6c7117a2..6c7117a2 100644
--- a/test/bad/bad-blank-syntax.ttl
+++ b/test/extra/bad/bad-blank-syntax.ttl
diff --git a/test/bad/bad-blank.ttl b/test/extra/bad/bad-blank.ttl
index a6543f2d..a6543f2d 100644
--- a/test/bad/bad-blank.ttl
+++ b/test/extra/bad/bad-blank.ttl
diff --git a/test/bad/bad-bom.ttl b/test/extra/bad/bad-bom.ttl
index 67993884..67993884 100644
--- a/test/bad/bad-bom.ttl
+++ b/test/extra/bad/bad-bom.ttl
diff --git a/test/bad/bad-char-in-local.ttl b/test/extra/bad/bad-char-in-local.ttl
index 973cc0a2..973cc0a2 100644
--- a/test/bad/bad-char-in-local.ttl
+++ b/test/extra/bad/bad-char-in-local.ttl
diff --git a/test/bad/bad-char-in-prefix.ttl b/test/extra/bad/bad-char-in-prefix.ttl
index b54e0274..b54e0274 100644
--- a/test/bad/bad-char-in-prefix.ttl
+++ b/test/extra/bad/bad-char-in-prefix.ttl
diff --git a/test/bad/bad-char-in-uri.ttl b/test/extra/bad/bad-char-in-uri.ttl
index 49f9c0d4..49f9c0d4 100644
--- a/test/bad/bad-char-in-uri.ttl
+++ b/test/extra/bad/bad-char-in-uri.ttl
diff --git a/test/bad/bad-datatype-syntax.ttl b/test/extra/bad/bad-datatype-syntax.ttl
index 541c25d4..541c25d4 100644
--- a/test/bad/bad-datatype-syntax.ttl
+++ b/test/extra/bad/bad-datatype-syntax.ttl
diff --git a/test/bad/bad-datatype.ttl b/test/extra/bad/bad-datatype.ttl
index 0dd6018f..0dd6018f 100644
--- a/test/bad/bad-datatype.ttl
+++ b/test/extra/bad/bad-datatype.ttl
diff --git a/test/bad/bad-dot-after-subject.ttl b/test/extra/bad/bad-dot-after-subject.ttl
index e76e0ea2..e76e0ea2 100644
--- a/test/bad/bad-dot-after-subject.ttl
+++ b/test/extra/bad/bad-dot-after-subject.ttl
diff --git a/test/bad/bad-dot-in-collection.ttl b/test/extra/bad/bad-dot-in-collection.ttl
index d2d35bc2..d2d35bc2 100644
--- a/test/bad/bad-dot-in-collection.ttl
+++ b/test/extra/bad/bad-dot-in-collection.ttl
diff --git a/test/bad/bad-eof-after-quotes.ttl b/test/extra/bad/bad-eof-after-quotes.ttl
index 40e429cb..40e429cb 100644
--- a/test/bad/bad-eof-after-quotes.ttl
+++ b/test/extra/bad/bad-eof-after-quotes.ttl
diff --git a/test/bad/bad-eof-at-string-start.ttl b/test/extra/bad/bad-eof-at-string-start.ttl
index 93d20bcc..93d20bcc 100644
--- a/test/bad/bad-eof-at-string-start.ttl
+++ b/test/extra/bad/bad-eof-at-string-start.ttl
diff --git a/test/bad/bad-eof-in-blank.ttl b/test/extra/bad/bad-eof-in-blank.ttl
index 8cf4ee84..8cf4ee84 100644
--- a/test/bad/bad-eof-in-blank.ttl
+++ b/test/extra/bad/bad-eof-in-blank.ttl
diff --git a/test/bad/bad-eof-in-escape.ttl b/test/extra/bad/bad-eof-in-escape.ttl
index 24b4eec6..24b4eec6 100644
--- a/test/bad/bad-eof-in-escape.ttl
+++ b/test/extra/bad/bad-eof-in-escape.ttl
diff --git a/test/bad/bad-eof-in-lang-suffix.ttl b/test/extra/bad/bad-eof-in-lang-suffix.ttl
index f46a7763..f46a7763 100644
--- a/test/bad/bad-eof-in-lang-suffix.ttl
+++ b/test/extra/bad/bad-eof-in-lang-suffix.ttl
diff --git a/test/bad/bad-eof-in-lang.ttl b/test/extra/bad/bad-eof-in-lang.ttl
index bfdffd02..bfdffd02 100644
--- a/test/bad/bad-eof-in-lang.ttl
+++ b/test/extra/bad/bad-eof-in-lang.ttl
diff --git a/test/bad/bad-eof-in-list.ttl b/test/extra/bad/bad-eof-in-list.ttl
index 13eeb88d..13eeb88d 100644
--- a/test/bad/bad-eof-in-list.ttl
+++ b/test/extra/bad/bad-eof-in-list.ttl
diff --git a/test/bad/bad-eof-in-long-string.ttl b/test/extra/bad/bad-eof-in-long-string.ttl
index 2ef179a8..2ef179a8 100644
--- a/test/bad/bad-eof-in-long-string.ttl
+++ b/test/extra/bad/bad-eof-in-long-string.ttl
diff --git a/test/bad/bad-eof-in-object-list.ttl b/test/extra/bad/bad-eof-in-object-list.ttl
index 9bbcd17a..9bbcd17a 100644
--- a/test/bad/bad-eof-in-object-list.ttl
+++ b/test/extra/bad/bad-eof-in-object-list.ttl
diff --git a/test/bad/bad-eof-in-object-list2.ttl b/test/extra/bad/bad-eof-in-object-list2.ttl
index 9186fb9f..9186fb9f 100644
--- a/test/bad/bad-eof-in-object-list2.ttl
+++ b/test/extra/bad/bad-eof-in-object-list2.ttl
diff --git a/test/bad/bad-eof-in-predicate-list.ttl b/test/extra/bad/bad-eof-in-predicate-list.ttl
index eab5b05b..eab5b05b 100644
--- a/test/bad/bad-eof-in-predicate-list.ttl
+++ b/test/extra/bad/bad-eof-in-predicate-list.ttl
diff --git a/test/bad/bad-eof-in-string.ttl b/test/extra/bad/bad-eof-in-string.ttl
index bb6e817f..bb6e817f 100644
--- a/test/bad/bad-eof-in-string.ttl
+++ b/test/extra/bad/bad-eof-in-string.ttl
diff --git a/test/bad/bad-eof-in-triple-quote.ttl b/test/extra/bad/bad-eof-in-triple-quote.ttl
index fb935441..fb935441 100644
--- a/test/bad/bad-eof-in-triple-quote.ttl
+++ b/test/extra/bad/bad-eof-in-triple-quote.ttl
diff --git a/test/bad/bad-eof-in-uri-scheme.nt b/test/extra/bad/bad-eof-in-uri-scheme.nt
index de892dcf..de892dcf 100644
--- a/test/bad/bad-eof-in-uri-scheme.nt
+++ b/test/extra/bad/bad-eof-in-uri-scheme.nt
diff --git a/test/bad/bad-eof-in-uri.ttl b/test/extra/bad/bad-eof-in-uri.ttl
index 07b6e6ab..07b6e6ab 100644
--- a/test/bad/bad-eof-in-uri.ttl
+++ b/test/extra/bad/bad-eof-in-uri.ttl
diff --git a/test/bad/bad-escape.ttl b/test/extra/bad/bad-escape.ttl
index c03f395f..c03f395f 100644
--- a/test/bad/bad-escape.ttl
+++ b/test/extra/bad/bad-escape.ttl
diff --git a/test/bad/bad-ext-namedblank-op.ttl b/test/extra/bad/bad-ext-namedblank-op.ttl
index 5e648393..5e648393 100644
--- a/test/bad/bad-ext-namedblank-op.ttl
+++ b/test/extra/bad/bad-ext-namedblank-op.ttl
diff --git a/test/bad/bad-graph-blank-label.trig b/test/extra/bad/bad-graph-blank-label.trig
index 8b329db3..8b329db3 100644
--- a/test/bad/bad-graph-blank-label.trig
+++ b/test/extra/bad/bad-graph-blank-label.trig
diff --git a/test/bad/bad-hex-digit.ttl b/test/extra/bad/bad-hex-digit.ttl
index 85816ced..85816ced 100644
--- a/test/bad/bad-hex-digit.ttl
+++ b/test/extra/bad/bad-hex-digit.ttl
diff --git a/test/bad/bad-id-clash.ttl b/test/extra/bad/bad-id-clash.ttl
index c1536840..c1536840 100644
--- a/test/bad/bad-id-clash.ttl
+++ b/test/extra/bad/bad-id-clash.ttl
diff --git a/test/bad/bad-lang.ttl b/test/extra/bad/bad-lang.ttl
index 01e04328..01e04328 100644
--- a/test/bad/bad-lang.ttl
+++ b/test/extra/bad/bad-lang.ttl
diff --git a/test/bad/bad-list.ttl b/test/extra/bad/bad-list.ttl
index 5606658e..5606658e 100644
--- a/test/bad/bad-list.ttl
+++ b/test/extra/bad/bad-list.ttl
diff --git a/test/bad/bad-list2.ttl b/test/extra/bad/bad-list2.ttl
index 18584209..18584209 100644
--- a/test/bad/bad-list2.ttl
+++ b/test/extra/bad/bad-list2.ttl
diff --git a/test/bad/bad-long-literal-in-list.ttl b/test/extra/bad/bad-long-literal-in-list.ttl
index f10b4c3d..f10b4c3d 100644
--- a/test/bad/bad-long-literal-in-list.ttl
+++ b/test/extra/bad/bad-long-literal-in-list.ttl
diff --git a/test/bad/bad-missing-semi.ttl b/test/extra/bad/bad-missing-semi.ttl
index f8838805..f8838805 100644
--- a/test/bad/bad-missing-semi.ttl
+++ b/test/extra/bad/bad-missing-semi.ttl
diff --git a/test/bad/bad-missing-uri-scheme.nt b/test/extra/bad/bad-missing-uri-scheme.nt
index 5d7bc724..5d7bc724 100644
--- a/test/bad/bad-missing-uri-scheme.nt
+++ b/test/extra/bad/bad-missing-uri-scheme.nt
diff --git a/test/bad/bad-misspelled-base.ttl b/test/extra/bad/bad-misspelled-base.ttl
index c8ae227a..c8ae227a 100644
--- a/test/bad/bad-misspelled-base.ttl
+++ b/test/extra/bad/bad-misspelled-base.ttl
diff --git a/test/bad/bad-misspelled-prefix.ttl b/test/extra/bad/bad-misspelled-prefix.ttl
index 8c9d57f6..8c9d57f6 100644
--- a/test/bad/bad-misspelled-prefix.ttl
+++ b/test/extra/bad/bad-misspelled-prefix.ttl
diff --git a/test/bad/bad-namespace.ttl b/test/extra/bad/bad-namespace.ttl
index 0dd78d33..0dd78d33 100644
--- a/test/bad/bad-namespace.ttl
+++ b/test/extra/bad/bad-namespace.ttl
diff --git a/test/bad/bad-ns.ttl b/test/extra/bad/bad-ns.ttl
index 4410573e..4410573e 100644
--- a/test/bad/bad-ns.ttl
+++ b/test/extra/bad/bad-ns.ttl
diff --git a/test/bad/bad-null-byte.ttl b/test/extra/bad/bad-null-byte.ttl
index 4f2cb404..4f2cb404 100644
--- a/test/bad/bad-null-byte.ttl
+++ b/test/extra/bad/bad-null-byte.ttl
diff --git a/test/bad/bad-num.ttl b/test/extra/bad/bad-num.ttl
index 7685f0e0..7685f0e0 100644
--- a/test/bad/bad-num.ttl
+++ b/test/extra/bad/bad-num.ttl
diff --git a/test/bad/bad-object.ttl b/test/extra/bad/bad-object.ttl
index 9fc6da18..9fc6da18 100644
--- a/test/bad/bad-object.ttl
+++ b/test/extra/bad/bad-object.ttl
diff --git a/test/bad/bad-object2.ttl b/test/extra/bad/bad-object2.ttl
index 9293d168..9293d168 100644
--- a/test/bad/bad-object2.ttl
+++ b/test/extra/bad/bad-object2.ttl
diff --git a/test/bad/bad-pn-escape.ttl b/test/extra/bad/bad-pn-escape.ttl
index 2b363e89..2b363e89 100644
--- a/test/bad/bad-pn-escape.ttl
+++ b/test/extra/bad/bad-pn-escape.ttl
diff --git a/test/bad/bad-prefix.ttl b/test/extra/bad/bad-prefix.ttl
index 6c286355..6c286355 100644
--- a/test/bad/bad-prefix.ttl
+++ b/test/extra/bad/bad-prefix.ttl
diff --git a/test/bad/bad-quote-in-uri.ttl b/test/extra/bad/bad-quote-in-uri.ttl
index 30711241..30711241 100644
--- a/test/bad/bad-quote-in-uri.ttl
+++ b/test/extra/bad/bad-quote-in-uri.ttl
diff --git a/test/bad/bad-semicolon-after-subject.ttl b/test/extra/bad/bad-semicolon-after-subject.ttl
index 582c6ea0..582c6ea0 100644
--- a/test/bad/bad-semicolon-after-subject.ttl
+++ b/test/extra/bad/bad-semicolon-after-subject.ttl
diff --git a/test/bad/bad-string.ttl b/test/extra/bad/bad-string.ttl
index 0bdea42c..0bdea42c 100644
--- a/test/bad/bad-string.ttl
+++ b/test/extra/bad/bad-string.ttl
diff --git a/test/bad/bad-subject.ttl b/test/extra/bad/bad-subject.ttl
index b98ea39b..b98ea39b 100644
--- a/test/bad/bad-subject.ttl
+++ b/test/extra/bad/bad-subject.ttl
diff --git a/test/bad/bad-uri-escape.ttl b/test/extra/bad/bad-uri-escape.ttl
index 16c63754..16c63754 100644
--- a/test/bad/bad-uri-escape.ttl
+++ b/test/extra/bad/bad-uri-escape.ttl
diff --git a/test/bad/bad-uri-scheme-start.nt b/test/extra/bad/bad-uri-scheme-start.nt
index cd3fd70f..cd3fd70f 100644
--- a/test/bad/bad-uri-scheme-start.nt
+++ b/test/extra/bad/bad-uri-scheme-start.nt
diff --git a/test/bad/bad-uri-scheme.nt b/test/extra/bad/bad-uri-scheme.nt
index 1329edcd..1329edcd 100644
--- a/test/bad/bad-uri-scheme.nt
+++ b/test/extra/bad/bad-uri-scheme.nt
diff --git a/test/bad/bad-uri-truncated.nt b/test/extra/bad/bad-uri-truncated.nt
index 22d29e4b..22d29e4b 100644
--- a/test/bad/bad-uri-truncated.nt
+++ b/test/extra/bad/bad-uri-truncated.nt
diff --git a/test/bad/bad-verb.ttl b/test/extra/bad/bad-verb.ttl
index 56a134f3..56a134f3 100644
--- a/test/bad/bad-verb.ttl
+++ b/test/extra/bad/bad-verb.ttl
diff --git a/test/bad/invalid-char-in-local.ttl b/test/extra/bad/invalid-char-in-local.ttl
index 520c2404..520c2404 100644
--- a/test/bad/invalid-char-in-local.ttl
+++ b/test/extra/bad/invalid-char-in-local.ttl
diff --git a/test/bad/invalid-char-in-prefix.ttl b/test/extra/bad/invalid-char-in-prefix.ttl
index 79547803..79547803 100644
--- a/test/bad/invalid-char-in-prefix.ttl
+++ b/test/extra/bad/invalid-char-in-prefix.ttl
diff --git a/test/bad/manifest.ttl b/test/extra/bad/manifest.ttl
index 05bcc69d..05bcc69d 100644
--- a/test/bad/manifest.ttl
+++ b/test/extra/bad/manifest.ttl
diff --git a/test/full/README.md b/test/extra/full/README.md
index 5cadb1b1..5cadb1b1 100644
--- a/test/full/README.md
+++ b/test/extra/full/README.md
diff --git a/test/full/full-uris.ttl b/test/extra/full/full-uris.ttl
index cfb048df..cfb048df 100644
--- a/test/full/full-uris.ttl
+++ b/test/extra/full/full-uris.ttl
diff --git a/test/full/manifest.ttl b/test/extra/full/manifest.ttl
index a7cfac4a..a7cfac4a 100644
--- a/test/full/manifest.ttl
+++ b/test/extra/full/manifest.ttl
diff --git a/test/good/manifest.ttl b/test/extra/good/manifest.ttl
index 5b5c625b..5b5c625b 100644
--- a/test/good/manifest.ttl
+++ b/test/extra/good/manifest.ttl
diff --git a/test/good/test-14.nt b/test/extra/good/test-14.nt
index 791b3a7a..791b3a7a 100644
--- a/test/good/test-14.nt
+++ b/test/extra/good/test-14.nt
diff --git a/test/good/test-14.ttl b/test/extra/good/test-14.ttl
index ad9dbde8..ad9dbde8 100644
--- a/test/good/test-14.ttl
+++ b/test/extra/good/test-14.ttl
diff --git a/test/good/test-15.nt b/test/extra/good/test-15.nt
index c0604b3b..c0604b3b 100644
--- a/test/good/test-15.nt
+++ b/test/extra/good/test-15.nt
diff --git a/test/good/test-15.ttl b/test/extra/good/test-15.ttl
index 10df17df..10df17df 100644
--- a/test/good/test-15.ttl
+++ b/test/extra/good/test-15.ttl
diff --git a/test/good/test-16.nt b/test/extra/good/test-16.nt
index c0604b3b..c0604b3b 100644
--- a/test/good/test-16.nt
+++ b/test/extra/good/test-16.nt
diff --git a/test/good/test-16.ttl b/test/extra/good/test-16.ttl
index a9ac37fb..a9ac37fb 100644
--- a/test/good/test-16.ttl
+++ b/test/extra/good/test-16.ttl
diff --git a/test/good/test-18.nt b/test/extra/good/test-18.nt
index 4ff4b95b..4ff4b95b 100644
--- a/test/good/test-18.nt
+++ b/test/extra/good/test-18.nt
diff --git a/test/good/test-18.ttl b/test/extra/good/test-18.ttl
index 1adfa451..1adfa451 100644
--- a/test/good/test-18.ttl
+++ b/test/extra/good/test-18.ttl
diff --git a/test/good/test-30.nt b/test/extra/good/test-30.nt
index f400cba6..f400cba6 100644
--- a/test/good/test-30.nt
+++ b/test/extra/good/test-30.nt
diff --git a/test/good/test-30.ttl b/test/extra/good/test-30.ttl
index 9aff060f..9aff060f 100644
--- a/test/good/test-30.ttl
+++ b/test/extra/good/test-30.ttl
diff --git a/test/good/test-a-without-whitespace.nt b/test/extra/good/test-a-without-whitespace.nt
index 27c5e7da..27c5e7da 100644
--- a/test/good/test-a-without-whitespace.nt
+++ b/test/extra/good/test-a-without-whitespace.nt
diff --git a/test/good/test-a-without-whitespace.ttl b/test/extra/good/test-a-without-whitespace.ttl
index 2d6db000..2d6db000 100644
--- a/test/good/test-a-without-whitespace.ttl
+++ b/test/extra/good/test-a-without-whitespace.ttl
diff --git a/test/good/test-backspace.nt b/test/extra/good/test-backspace.nt
index 3dfffa38..3dfffa38 100644
--- a/test/good/test-backspace.nt
+++ b/test/extra/good/test-backspace.nt
diff --git a/test/good/test-backspace.ttl b/test/extra/good/test-backspace.ttl
index 1e33ba95..1e33ba95 100644
--- a/test/good/test-backspace.ttl
+++ b/test/extra/good/test-backspace.ttl
diff --git a/test/good/test-base-nopath.nt b/test/extra/good/test-base-nopath.nt
index 8628a30b..8628a30b 100644
--- a/test/good/test-base-nopath.nt
+++ b/test/extra/good/test-base-nopath.nt
diff --git a/test/good/test-base-nopath.ttl b/test/extra/good/test-base-nopath.ttl
index 8735936a..8735936a 100644
--- a/test/good/test-base-nopath.ttl
+++ b/test/extra/good/test-base-nopath.ttl
diff --git a/test/good/test-base-query.nt b/test/extra/good/test-base-query.nt
index 89456a44..89456a44 100644
--- a/test/good/test-base-query.nt
+++ b/test/extra/good/test-base-query.nt
diff --git a/test/good/test-base-query.ttl b/test/extra/good/test-base-query.ttl
index 583dd610..583dd610 100644
--- a/test/good/test-base-query.ttl
+++ b/test/extra/good/test-base-query.ttl
diff --git a/test/good/test-base.nt b/test/extra/good/test-base.nt
index 4e8e4c82..4e8e4c82 100644
--- a/test/good/test-base.nt
+++ b/test/extra/good/test-base.nt
diff --git a/test/good/test-base.ttl b/test/extra/good/test-base.ttl
index 4c437937..4c437937 100644
--- a/test/good/test-base.ttl
+++ b/test/extra/good/test-base.ttl
diff --git a/test/good/test-blank-cont.nt b/test/extra/good/test-blank-cont.nt
index a4b44e7d..a4b44e7d 100644
--- a/test/good/test-blank-cont.nt
+++ b/test/extra/good/test-blank-cont.nt
diff --git a/test/good/test-blank-cont.ttl b/test/extra/good/test-blank-cont.ttl
index b161cdc4..b161cdc4 100644
--- a/test/good/test-blank-cont.ttl
+++ b/test/extra/good/test-blank-cont.ttl
diff --git a/test/good/test-blank-in-list.nt b/test/extra/good/test-blank-in-list.nt
index 36bac6d7..36bac6d7 100644
--- a/test/good/test-blank-in-list.nt
+++ b/test/extra/good/test-blank-in-list.nt
diff --git a/test/good/test-blank-in-list.ttl b/test/extra/good/test-blank-in-list.ttl
index 5c0b0766..5c0b0766 100644
--- a/test/good/test-blank-in-list.ttl
+++ b/test/extra/good/test-blank-in-list.ttl
diff --git a/test/good/test-blank-node-statement.nt b/test/extra/good/test-blank-node-statement.nt
index 3280b28d..3280b28d 100644
--- a/test/good/test-blank-node-statement.nt
+++ b/test/extra/good/test-blank-node-statement.nt
diff --git a/test/good/test-blank-node-statement.ttl b/test/extra/good/test-blank-node-statement.ttl
index c84f8487..c84f8487 100644
--- a/test/good/test-blank-node-statement.ttl
+++ b/test/extra/good/test-blank-node-statement.ttl
diff --git a/test/good/test-blankdot.nt b/test/extra/good/test-blankdot.nt
index 9d4b769b..9d4b769b 100644
--- a/test/good/test-blankdot.nt
+++ b/test/extra/good/test-blankdot.nt
diff --git a/test/good/test-blankdot.ttl b/test/extra/good/test-blankdot.ttl
index a6ee7234..a6ee7234 100644
--- a/test/good/test-blankdot.ttl
+++ b/test/extra/good/test-blankdot.ttl
diff --git a/test/good/test-bom.nt b/test/extra/good/test-bom.nt
index aea1655b..aea1655b 100644
--- a/test/good/test-bom.nt
+++ b/test/extra/good/test-bom.nt
diff --git a/test/good/test-bom.ttl b/test/extra/good/test-bom.ttl
index 8d6534e1..8d6534e1 100644
--- a/test/good/test-bom.ttl
+++ b/test/extra/good/test-bom.ttl
diff --git a/test/good/test-cr.nt b/test/extra/good/test-cr.nt
index aea1655b..aea1655b 100644
--- a/test/good/test-cr.nt
+++ b/test/extra/good/test-cr.nt
diff --git a/test/good/test-cr.ttl b/test/extra/good/test-cr.ttl
index 5410648a..5410648a 100644
--- a/test/good/test-cr.ttl
+++ b/test/extra/good/test-cr.ttl
diff --git a/test/good/test-delete.nt b/test/extra/good/test-delete.nt
index 41ac8062..41ac8062 100644
--- a/test/good/test-delete.nt
+++ b/test/extra/good/test-delete.nt
diff --git a/test/good/test-delete.ttl b/test/extra/good/test-delete.ttl
index 4bc97060..4bc97060 100644
--- a/test/good/test-delete.ttl
+++ b/test/extra/good/test-delete.ttl
diff --git a/test/good/test-digit-start-pname.nt b/test/extra/good/test-digit-start-pname.nt
index 66eab7db..66eab7db 100644
--- a/test/good/test-digit-start-pname.nt
+++ b/test/extra/good/test-digit-start-pname.nt
diff --git a/test/good/test-digit-start-pname.ttl b/test/extra/good/test-digit-start-pname.ttl
index 6ca8ade8..6ca8ade8 100644
--- a/test/good/test-digit-start-pname.ttl
+++ b/test/extra/good/test-digit-start-pname.ttl
diff --git a/test/good/test-empty-path-base.nt b/test/extra/good/test-empty-path-base.nt
index 9ad50617..9ad50617 100644
--- a/test/good/test-empty-path-base.nt
+++ b/test/extra/good/test-empty-path-base.nt
diff --git a/test/good/test-empty-path-base.ttl b/test/extra/good/test-empty-path-base.ttl
index 8410553a..8410553a 100644
--- a/test/good/test-empty-path-base.ttl
+++ b/test/extra/good/test-empty-path-base.ttl
diff --git a/test/good/test-empty.nt b/test/extra/good/test-empty.nt
index e69de29b..e69de29b 100644
--- a/test/good/test-empty.nt
+++ b/test/extra/good/test-empty.nt
diff --git a/test/good/test-empty.ttl b/test/extra/good/test-empty.ttl
index e69de29b..e69de29b 100644
--- a/test/good/test-empty.ttl
+++ b/test/extra/good/test-empty.ttl
diff --git a/test/good/test-eof-at-page-end.nt b/test/extra/good/test-eof-at-page-end.nt
index 64d24586..64d24586 100644
--- a/test/good/test-eof-at-page-end.nt
+++ b/test/extra/good/test-eof-at-page-end.nt
diff --git a/test/good/test-eof-at-page-end.ttl b/test/extra/good/test-eof-at-page-end.ttl
index d6d9af26..d6d9af26 100644
--- a/test/good/test-eof-at-page-end.ttl
+++ b/test/extra/good/test-eof-at-page-end.ttl
diff --git a/test/good/test-escapes.nt b/test/extra/good/test-escapes.nt
index e30222e7..e30222e7 100644
--- a/test/good/test-escapes.nt
+++ b/test/extra/good/test-escapes.nt
diff --git a/test/good/test-escapes.ttl b/test/extra/good/test-escapes.ttl
index e30222e7..e30222e7 100644
--- a/test/good/test-escapes.ttl
+++ b/test/extra/good/test-escapes.ttl
diff --git a/test/good/test-ext-namedblank-iri.nt b/test/extra/good/test-ext-namedblank-iri.nt
index 26075a73..26075a73 100644
--- a/test/good/test-ext-namedblank-iri.nt
+++ b/test/extra/good/test-ext-namedblank-iri.nt
diff --git a/test/good/test-ext-namedblank-iri.ttl b/test/extra/good/test-ext-namedblank-iri.ttl
index 28fb32ab..28fb32ab 100644
--- a/test/good/test-ext-namedblank-iri.ttl
+++ b/test/extra/good/test-ext-namedblank-iri.ttl
diff --git a/test/good/test-ext-namedblank-prefix.nt b/test/extra/good/test-ext-namedblank-prefix.nt
index 9a2710fb..9a2710fb 100644
--- a/test/good/test-ext-namedblank-prefix.nt
+++ b/test/extra/good/test-ext-namedblank-prefix.nt
diff --git a/test/good/test-ext-namedblank-prefix.ttl b/test/extra/good/test-ext-namedblank-prefix.ttl
index 7de79655..7de79655 100644
--- a/test/good/test-ext-namedblank-prefix.ttl
+++ b/test/extra/good/test-ext-namedblank-prefix.ttl
diff --git a/test/good/test-form-feed.nt b/test/extra/good/test-form-feed.nt
index 05478971..05478971 100644
--- a/test/good/test-form-feed.nt
+++ b/test/extra/good/test-form-feed.nt
diff --git a/test/good/test-form-feed.ttl b/test/extra/good/test-form-feed.ttl
index 78921159..78921159 100644
--- a/test/good/test-form-feed.ttl
+++ b/test/extra/good/test-form-feed.ttl
diff --git a/test/good/test-id.nt b/test/extra/good/test-id.nt
index b4b11069..b4b11069 100644
--- a/test/good/test-id.nt
+++ b/test/extra/good/test-id.nt
diff --git a/test/good/test-id.ttl b/test/extra/good/test-id.ttl
index cfd0e9ca..cfd0e9ca 100644
--- a/test/good/test-id.ttl
+++ b/test/extra/good/test-id.ttl
diff --git a/test/good/test-lang.nt b/test/extra/good/test-lang.nt
index 61daecb3..61daecb3 100644
--- a/test/good/test-lang.nt
+++ b/test/extra/good/test-lang.nt
diff --git a/test/good/test-lang.ttl b/test/extra/good/test-lang.ttl
index b0616475..b0616475 100644
--- a/test/good/test-lang.ttl
+++ b/test/extra/good/test-lang.ttl
diff --git a/test/good/test-list-in-blank.nt b/test/extra/good/test-list-in-blank.nt
index 108363f2..108363f2 100644
--- a/test/good/test-list-in-blank.nt
+++ b/test/extra/good/test-list-in-blank.nt
diff --git a/test/good/test-list-in-blank.ttl b/test/extra/good/test-list-in-blank.ttl
index bdf75fce..bdf75fce 100644
--- a/test/good/test-list-in-blank.ttl
+++ b/test/extra/good/test-list-in-blank.ttl
diff --git a/test/good/test-list-subject.nt b/test/extra/good/test-list-subject.nt
index e4f9c40c..e4f9c40c 100644
--- a/test/good/test-list-subject.nt
+++ b/test/extra/good/test-list-subject.nt
diff --git a/test/good/test-list-subject.ttl b/test/extra/good/test-list-subject.ttl
index 5cd81dfb..5cd81dfb 100644
--- a/test/good/test-list-subject.ttl
+++ b/test/extra/good/test-list-subject.ttl
diff --git a/test/good/test-list.nt b/test/extra/good/test-list.nt
index 3a27a5a6..3a27a5a6 100644
--- a/test/good/test-list.nt
+++ b/test/extra/good/test-list.nt
diff --git a/test/good/test-list.ttl b/test/extra/good/test-list.ttl
index 7f4c7699..7f4c7699 100644
--- a/test/good/test-list.ttl
+++ b/test/extra/good/test-list.ttl
diff --git a/test/good/test-local-name-ends-with-dot.ttl b/test/extra/good/test-local-name-ends-with-dot.ttl
index e426876d..e426876d 100644
--- a/test/good/test-local-name-ends-with-dot.ttl
+++ b/test/extra/good/test-local-name-ends-with-dot.ttl
diff --git a/test/good/test-long-string.nt b/test/extra/good/test-long-string.nt
index ba6be49c..ba6be49c 100644
--- a/test/good/test-long-string.nt
+++ b/test/extra/good/test-long-string.nt
diff --git a/test/good/test-long-string.ttl b/test/extra/good/test-long-string.ttl
index 7da44b4b..7da44b4b 100644
--- a/test/good/test-long-string.ttl
+++ b/test/extra/good/test-long-string.ttl
diff --git a/test/good/test-no-spaces.nt b/test/extra/good/test-no-spaces.nt
index 3619a5f0..3619a5f0 100644
--- a/test/good/test-no-spaces.nt
+++ b/test/extra/good/test-no-spaces.nt
diff --git a/test/good/test-no-spaces.ttl b/test/extra/good/test-no-spaces.ttl
index 88171e71..88171e71 100644
--- a/test/good/test-no-spaces.ttl
+++ b/test/extra/good/test-no-spaces.ttl
diff --git a/test/good/test-non-curie-uri.nt b/test/extra/good/test-non-curie-uri.nt
index 502a8754..502a8754 100644
--- a/test/good/test-non-curie-uri.nt
+++ b/test/extra/good/test-non-curie-uri.nt
diff --git a/test/good/test-non-curie-uri.ttl b/test/extra/good/test-non-curie-uri.ttl
index 40734514..40734514 100644
--- a/test/good/test-non-curie-uri.ttl
+++ b/test/extra/good/test-non-curie-uri.ttl
diff --git a/test/good/test-num.nt b/test/extra/good/test-num.nt
index 54263d46..54263d46 100644
--- a/test/good/test-num.nt
+++ b/test/extra/good/test-num.nt
diff --git a/test/good/test-num.ttl b/test/extra/good/test-num.ttl
index 68ad290b..68ad290b 100644
--- a/test/good/test-num.ttl
+++ b/test/extra/good/test-num.ttl
diff --git a/test/good/test-out-of-range-unicode.nt b/test/extra/good/test-out-of-range-unicode.nt
index 5def9e31..5def9e31 100644
--- a/test/good/test-out-of-range-unicode.nt
+++ b/test/extra/good/test-out-of-range-unicode.nt
diff --git a/test/good/test-out-of-range-unicode.ttl b/test/extra/good/test-out-of-range-unicode.ttl
index 7e64785a..7e64785a 100644
--- a/test/good/test-out-of-range-unicode.ttl
+++ b/test/extra/good/test-out-of-range-unicode.ttl
diff --git a/test/good/test-prefix.nt b/test/extra/good/test-prefix.nt
index bcfdd4b6..bcfdd4b6 100644
--- a/test/good/test-prefix.nt
+++ b/test/extra/good/test-prefix.nt
diff --git a/test/good/test-prefix.ttl b/test/extra/good/test-prefix.ttl
index f79896cb..f79896cb 100644
--- a/test/good/test-prefix.ttl
+++ b/test/extra/good/test-prefix.ttl
diff --git a/test/good/test-quote-escapes.nt b/test/extra/good/test-quote-escapes.nt
index 26c06a8d..26c06a8d 100644
--- a/test/good/test-quote-escapes.nt
+++ b/test/extra/good/test-quote-escapes.nt
diff --git a/test/good/test-quote-escapes.ttl b/test/extra/good/test-quote-escapes.ttl
index ffe14807..ffe14807 100644
--- a/test/good/test-quote-escapes.ttl
+++ b/test/extra/good/test-quote-escapes.ttl
diff --git a/test/good/test-rel.nt b/test/extra/good/test-rel.nt
index 343ce19c..343ce19c 100644
--- a/test/good/test-rel.nt
+++ b/test/extra/good/test-rel.nt
diff --git a/test/good/test-rel.ttl b/test/extra/good/test-rel.ttl
index 4752be70..4752be70 100644
--- a/test/good/test-rel.ttl
+++ b/test/extra/good/test-rel.ttl
diff --git a/test/good/test-semi-dot.nt b/test/extra/good/test-semi-dot.nt
index aea1655b..aea1655b 100644
--- a/test/good/test-semi-dot.nt
+++ b/test/extra/good/test-semi-dot.nt
diff --git a/test/good/test-semi-dot.ttl b/test/extra/good/test-semi-dot.ttl
index 6d4b4146..6d4b4146 100644
--- a/test/good/test-semi-dot.ttl
+++ b/test/extra/good/test-semi-dot.ttl
diff --git a/test/good/test-several-eaten-dots.nq b/test/extra/good/test-several-eaten-dots.nq
index 5cafa59f..5cafa59f 100644
--- a/test/good/test-several-eaten-dots.nq
+++ b/test/extra/good/test-several-eaten-dots.nq
diff --git a/test/good/test-several-eaten-dots.trig b/test/extra/good/test-several-eaten-dots.trig
index bab135ed..bab135ed 100644
--- a/test/good/test-several-eaten-dots.trig
+++ b/test/extra/good/test-several-eaten-dots.trig
diff --git a/test/good/test-uri-escape.nt b/test/extra/good/test-uri-escape.nt
index 320e7c33..320e7c33 100644
--- a/test/good/test-uri-escape.nt
+++ b/test/extra/good/test-uri-escape.nt
diff --git a/test/good/test-uri-escape.ttl b/test/extra/good/test-uri-escape.ttl
index 320e7c33..320e7c33 100644
--- a/test/good/test-uri-escape.ttl
+++ b/test/extra/good/test-uri-escape.ttl
diff --git a/test/good/test-uri.nt b/test/extra/good/test-uri.nt
index 1744963c..1744963c 100644
--- a/test/good/test-uri.nt
+++ b/test/extra/good/test-uri.nt
diff --git a/test/good/test-uri.ttl b/test/extra/good/test-uri.ttl
index 641d6bcf..641d6bcf 100644
--- a/test/good/test-uri.ttl
+++ b/test/extra/good/test-uri.ttl
diff --git a/test/good/test-utf8-uri.nt b/test/extra/good/test-utf8-uri.nt
index b8a73a88..b8a73a88 100644
--- a/test/good/test-utf8-uri.nt
+++ b/test/extra/good/test-utf8-uri.nt
diff --git a/test/good/test-utf8-uri.ttl b/test/extra/good/test-utf8-uri.ttl
index 51f26ff2..51f26ff2 100644
--- a/test/good/test-utf8-uri.ttl
+++ b/test/extra/good/test-utf8-uri.ttl
diff --git a/test/good/test-utf8.nt b/test/extra/good/test-utf8.nt
index f2f3838f..f2f3838f 100644
--- a/test/good/test-utf8.nt
+++ b/test/extra/good/test-utf8.nt
diff --git a/test/good/test-utf8.ttl b/test/extra/good/test-utf8.ttl
index b629f1aa..b629f1aa 100644
--- a/test/good/test-utf8.ttl
+++ b/test/extra/good/test-utf8.ttl
diff --git a/test/lax/README.md b/test/extra/lax/README.md
index d1b5d375..d1b5d375 100644
--- a/test/lax/README.md
+++ b/test/extra/lax/README.md
diff --git a/test/lax/manifest.ttl b/test/extra/lax/manifest.ttl
index 0cfdb776..5d220daf 100644
--- a/test/lax/manifest.ttl
+++ b/test/extra/lax/manifest.ttl
@@ -1,10 +1,9 @@
 @prefix mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdft: <http://www.w3.org/ns/rdftest#> .
 
 <>
-	rdf:type mf:Manifest ;
+	a mf:Manifest ;
 	rdfs:comment "Serd lax syntax test cases" ;
 	mf:entries (
 		<#test-bad-string>
@@ -13,20 +12,19 @@
 	) .
 
 <#test-bad-string>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "test-bad-string" ;
+	a rdft:TestTurtleNegativeSyntax ;
 	mf:action <test-bad-string.ttl> ;
+	mf:name "test-bad-string" ;
 	mf:result <test-bad-string.nt> .
 
 <#test-bad-uri>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "test-bad-uri" ;
+	a rdft:TestTurtleNegativeSyntax ;
 	mf:action <test-bad-uri.ttl> ;
+	mf:name "test-bad-uri" ;
 	mf:result <test-bad-uri.nt> .
 
 <#test-bad-utf8>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "test-bad-utf8" ;
+	a rdft:TestTurtleNegativeSyntax ;
 	mf:action <test-bad-utf8.ttl> ;
+	mf:name "test-bad-utf8" ;
 	mf:result <test-bad-utf8.nt> .
-
diff --git a/test/lax/test-bad-string.nt b/test/extra/lax/test-bad-string.nt
index 24f80a2e..24f80a2e 100644
--- a/test/lax/test-bad-string.nt
+++ b/test/extra/lax/test-bad-string.nt
diff --git a/test/lax/test-bad-string.ttl b/test/extra/lax/test-bad-string.ttl
index 72eb9621..72eb9621 100644
--- a/test/lax/test-bad-string.ttl
+++ b/test/extra/lax/test-bad-string.ttl
diff --git a/test/lax/test-bad-uri.nt b/test/extra/lax/test-bad-uri.nt
index 8cb00ba7..8cb00ba7 100644
--- a/test/lax/test-bad-uri.nt
+++ b/test/extra/lax/test-bad-uri.nt
diff --git a/test/lax/test-bad-uri.ttl b/test/extra/lax/test-bad-uri.ttl
index 8f11b1d7..8f11b1d7 100644
--- a/test/lax/test-bad-uri.ttl
+++ b/test/extra/lax/test-bad-uri.ttl
diff --git a/test/lax/test-bad-utf8.nt b/test/extra/lax/test-bad-utf8.nt
index 58f2c52b..58f2c52b 100644
--- a/test/lax/test-bad-utf8.nt
+++ b/test/extra/lax/test-bad-utf8.nt
diff --git a/test/lax/test-bad-utf8.ttl b/test/extra/lax/test-bad-utf8.ttl
index 0e177366..0e177366 100644
--- a/test/lax/test-bad-utf8.ttl
+++ b/test/extra/lax/test-bad-utf8.ttl
diff --git a/test/prefix/README.md b/test/extra/prefix/README.md
index 56a07244..56a07244 100644
--- a/test/prefix/README.md
+++ b/test/extra/prefix/README.md
diff --git a/test/prefix/manifest.ttl b/test/extra/prefix/manifest.ttl
index 12a0f9ca..12a0f9ca 100644
--- a/test/prefix/manifest.ttl
+++ b/test/extra/prefix/manifest.ttl
diff --git a/test/prefix/remove-prefixes.nt b/test/extra/prefix/remove-prefixes.nt
index 26ac46ee..26ac46ee 100644
--- a/test/prefix/remove-prefixes.nt
+++ b/test/extra/prefix/remove-prefixes.nt
diff --git a/test/prefix/remove-prefixes.ttl b/test/extra/prefix/remove-prefixes.ttl
index f3002a59..f3002a59 100644
--- a/test/prefix/remove-prefixes.ttl
+++ b/test/extra/prefix/remove-prefixes.ttl
diff --git a/test/pretty/README.md b/test/extra/pretty/README.md
index 361d9491..361d9491 100644
--- a/test/pretty/README.md
+++ b/test/extra/pretty/README.md
diff --git a/test/pretty/abbreviation.ttl b/test/extra/pretty/abbreviation.ttl
index bf46f6d5..bf46f6d5 100644
--- a/test/pretty/abbreviation.ttl
+++ b/test/extra/pretty/abbreviation.ttl
diff --git a/test/pretty/anonymous-in-list-object.ttl b/test/extra/pretty/anonymous-in-list-object.ttl
index 4f135e29..4f135e29 100644
--- a/test/pretty/anonymous-in-list-object.ttl
+++ b/test/extra/pretty/anonymous-in-list-object.ttl
diff --git a/test/pretty/anonymous-object.ttl b/test/extra/pretty/anonymous-object.ttl
index f592fed1..f592fed1 100644
--- a/test/pretty/anonymous-object.ttl
+++ b/test/extra/pretty/anonymous-object.ttl
diff --git a/test/pretty/anonymous-subject-and-object.ttl b/test/extra/pretty/anonymous-subject-and-object.ttl
index 8904cca6..8904cca6 100644
--- a/test/pretty/anonymous-subject-and-object.ttl
+++ b/test/extra/pretty/anonymous-subject-and-object.ttl
diff --git a/test/pretty/anonymous-subject.ttl b/test/extra/pretty/anonymous-subject.ttl
index e0e467e2..e0e467e2 100644
--- a/test/pretty/anonymous-subject.ttl
+++ b/test/extra/pretty/anonymous-subject.ttl
diff --git a/test/pretty/datatypes.ttl b/test/extra/pretty/datatypes.ttl
index 721dfe4d..721dfe4d 100644
--- a/test/pretty/datatypes.ttl
+++ b/test/extra/pretty/datatypes.ttl
diff --git a/test/pretty/empty-anonymous-object.ttl b/test/extra/pretty/empty-anonymous-object.ttl
index f3b8d7f7..f3b8d7f7 100644
--- a/test/pretty/empty-anonymous-object.ttl
+++ b/test/extra/pretty/empty-anonymous-object.ttl
diff --git a/test/pretty/empty-list-object.ttl b/test/extra/pretty/empty-list-object.ttl
index b4045ec0..b4045ec0 100644
--- a/test/pretty/empty-list-object.ttl
+++ b/test/extra/pretty/empty-list-object.ttl
diff --git a/test/pretty/empty-list-subject-and-object.ttl b/test/extra/pretty/empty-list-subject-and-object.ttl
index 3b84980e..3b84980e 100644
--- a/test/pretty/empty-list-subject-and-object.ttl
+++ b/test/extra/pretty/empty-list-subject-and-object.ttl
diff --git a/test/pretty/empty-list-subject.ttl b/test/extra/pretty/empty-list-subject.ttl
index 0610eb07..0610eb07 100644
--- a/test/pretty/empty-list-subject.ttl
+++ b/test/extra/pretty/empty-list-subject.ttl
diff --git a/test/pretty/ext-named-blank.ttl b/test/extra/pretty/ext-named-blank.ttl
index 807d6313..807d6313 100644
--- a/test/pretty/ext-named-blank.ttl
+++ b/test/extra/pretty/ext-named-blank.ttl
diff --git a/test/pretty/graph-abbreviation.trig b/test/extra/pretty/graph-abbreviation.trig
index 8ec75f6e..8ec75f6e 100644
--- a/test/pretty/graph-abbreviation.trig
+++ b/test/extra/pretty/graph-abbreviation.trig
diff --git a/test/pretty/inline-blank-subject.ttl b/test/extra/pretty/inline-blank-subject.ttl
index 8f5de39c..8f5de39c 100644
--- a/test/pretty/inline-blank-subject.ttl
+++ b/test/extra/pretty/inline-blank-subject.ttl
diff --git a/test/pretty/inline-blanks-and-lists.ttl b/test/extra/pretty/inline-blanks-and-lists.ttl
index c57482d3..c57482d3 100644
--- a/test/pretty/inline-blanks-and-lists.ttl
+++ b/test/extra/pretty/inline-blanks-and-lists.ttl
diff --git a/test/pretty/inline-list-subject.ttl b/test/extra/pretty/inline-list-subject.ttl
index a3f8ac18..a3f8ac18 100644
--- a/test/pretty/inline-list-subject.ttl
+++ b/test/extra/pretty/inline-list-subject.ttl
diff --git a/test/pretty/langtags.ttl b/test/extra/pretty/langtags.ttl
index 29d7e2d4..29d7e2d4 100644
--- a/test/pretty/langtags.ttl
+++ b/test/extra/pretty/langtags.ttl
diff --git a/test/pretty/list-in-object.ttl b/test/extra/pretty/list-in-object.ttl
index ce887157..ce887157 100644
--- a/test/pretty/list-in-object.ttl
+++ b/test/extra/pretty/list-in-object.ttl
diff --git a/test/pretty/list-object.ttl b/test/extra/pretty/list-object.ttl
index 735d9df6..735d9df6 100644
--- a/test/pretty/list-object.ttl
+++ b/test/extra/pretty/list-object.ttl
diff --git a/test/pretty/list-subject.ttl b/test/extra/pretty/list-subject.ttl
index 927f56f3..927f56f3 100644
--- a/test/pretty/list-subject.ttl
+++ b/test/extra/pretty/list-subject.ttl
diff --git a/test/pretty/local-name-escapes.ttl b/test/extra/pretty/local-name-escapes.ttl
index 91c3905d..91c3905d 100644
--- a/test/pretty/local-name-escapes.ttl
+++ b/test/extra/pretty/local-name-escapes.ttl
diff --git a/test/pretty/long-string-escapes.ttl b/test/extra/pretty/long-string-escapes.ttl
index 435e3d1a..435e3d1a 100644
--- a/test/pretty/long-string-escapes.ttl
+++ b/test/extra/pretty/long-string-escapes.ttl
diff --git a/test/pretty/long-string-quotes.ttl b/test/extra/pretty/long-string-quotes.ttl
index aceaecda..aceaecda 100644
--- a/test/pretty/long-string-quotes.ttl
+++ b/test/extra/pretty/long-string-quotes.ttl
diff --git a/test/pretty/manifest.ttl b/test/extra/pretty/manifest.ttl
index 69b951af..69b951af 100644
--- a/test/pretty/manifest.ttl
+++ b/test/extra/pretty/manifest.ttl
diff --git a/test/pretty/many-objects.ttl b/test/extra/pretty/many-objects.ttl
index 534741dd..534741dd 100644
--- a/test/pretty/many-objects.ttl
+++ b/test/extra/pretty/many-objects.ttl
diff --git a/test/pretty/named-graph.trig b/test/extra/pretty/named-graph.trig
index 5cd12f3b..5cd12f3b 100644
--- a/test/pretty/named-graph.trig
+++ b/test/extra/pretty/named-graph.trig
diff --git a/test/pretty/nested-list-object.ttl b/test/extra/pretty/nested-list-object.ttl
index d2177ba3..d2177ba3 100644
--- a/test/pretty/nested-list-object.ttl
+++ b/test/extra/pretty/nested-list-object.ttl
diff --git a/test/pretty/nested-list-subject.ttl b/test/extra/pretty/nested-list-subject.ttl
index 128197c0..128197c0 100644
--- a/test/pretty/nested-list-subject.ttl
+++ b/test/extra/pretty/nested-list-subject.ttl
diff --git a/test/pretty/relative-uris.ttl b/test/extra/pretty/relative-uris.ttl
index 397c7cf7..397c7cf7 100644
--- a/test/pretty/relative-uris.ttl
+++ b/test/extra/pretty/relative-uris.ttl
diff --git a/test/pretty/short-string-escapes.ttl b/test/extra/pretty/short-string-escapes.ttl
index 0665e814..0665e814 100644
--- a/test/pretty/short-string-escapes.ttl
+++ b/test/extra/pretty/short-string-escapes.ttl
diff --git a/test/pretty/uri-escapes.ttl b/test/extra/pretty/uri-escapes.ttl
index 09ced38a..09ced38a 100644
--- a/test/pretty/uri-escapes.ttl
+++ b/test/extra/pretty/uri-escapes.ttl
diff --git a/test/qualify/README.md b/test/extra/qualify/README.md
index c345f242..c345f242 100644
--- a/test/qualify/README.md
+++ b/test/extra/qualify/README.md
diff --git a/test/qualify/manifest.ttl b/test/extra/qualify/manifest.ttl
index 0a2fb698..0a2fb698 100644
--- a/test/qualify/manifest.ttl
+++ b/test/extra/qualify/manifest.ttl
diff --git a/test/qualify/qualify-in.ttl b/test/extra/qualify/qualify-in.ttl
index 04afc07f..04afc07f 100644
--- a/test/qualify/qualify-in.ttl
+++ b/test/extra/qualify/qualify-in.ttl
diff --git a/test/qualify/qualify-out.ttl b/test/extra/qualify/qualify-out.ttl
index f4dd15d4..f4dd15d4 100644
--- a/test/qualify/qualify-out.ttl
+++ b/test/extra/qualify/qualify-out.ttl
diff --git a/test/root/README.md b/test/extra/root/README.md
index bec7db1e..bec7db1e 100644
--- a/test/root/README.md
+++ b/test/extra/root/README.md
diff --git a/test/root/manifest.ttl b/test/extra/root/manifest.ttl
index 90c6a527..90c6a527 100644
--- a/test/root/manifest.ttl
+++ b/test/extra/root/manifest.ttl
diff --git a/test/root/root-inside-base-in.ttl b/test/extra/root/root-inside-base-in.ttl
index 3fca79ec..3fca79ec 100644
--- a/test/root/root-inside-base-in.ttl
+++ b/test/extra/root/root-inside-base-in.ttl
diff --git a/test/root/root-inside-base-out.ttl b/test/extra/root/root-inside-base-out.ttl
index 76f61791..76f61791 100644
--- a/test/root/root-inside-base-out.ttl
+++ b/test/extra/root/root-inside-base-out.ttl
diff --git a/test/root/root-outside-base-in.ttl b/test/extra/root/root-outside-base-in.ttl
index f0c9ef8a..f0c9ef8a 100644
--- a/test/root/root-outside-base-in.ttl
+++ b/test/extra/root/root-outside-base-in.ttl
diff --git a/test/root/root-outside-base-out.ttl b/test/extra/root/root-outside-base-out.ttl
index dcb95d5a..dcb95d5a 100644
--- a/test/root/root-outside-base-out.ttl
+++ b/test/extra/root/root-outside-base-out.ttl
diff --git a/test/meson.build b/test/meson.build
index 0f2268f6..bf36c971 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -122,6 +122,7 @@ simple_command_tests = {
 if is_variable('serdi')
   script_args = common_script_args + ['--serdi', serdi]
   serd_ttl = files('../serd.ttl')[0]
+  bad_input_file = files('extra/bad/bad-base.ttl')
 
   test('serd.ttl', serdi, args: [serd_ttl], suite: 'data')
 
@@ -146,7 +147,7 @@ if is_variable('serdi')
   test(
     'quiet',
     files('test_quiet.py'),
-    args: script_args + files('bad/bad-base.ttl'),
+    args: script_args + [bad_input_file],
     suite: cmd_suite,
   )
 
@@ -195,61 +196,61 @@ ns_w3 = 'http://www.w3.org/2013/'
 
 test_suites = {
   'NQuads': [
-    files('NQuadsTests/manifest.ttl'), ns_w3 + 'NQuadsTests/',
+    files('w3c/NQuadsTests/manifest.ttl'), ns_w3 + 'NQuadsTests/',
     '--', '-a', '-i', 'NQuads',
   ],
   'NTriples': [
-    files('NTriplesTests/manifest.ttl'), ns_w3 + 'NTriplesTests/',
+    files('w3c/NTriplesTests/manifest.ttl'), ns_w3 + 'NTriplesTests/',
     '--', '-a', '-i', 'NTriples',
   ],
   'TriG': [
-    files('TriGTests/manifest.ttl'), ns_w3 + 'TriGTests/',
+    files('w3c/TriGTests/manifest.ttl'), ns_w3 + 'TriGTests/',
     '--', '-a', '-f', '-i', 'TriG',
   ],
   'Turtle': [
-    files('TurtleTests/manifest.ttl'), ns_w3 + 'TurtleTests/',
+    files('w3c/TurtleTests/manifest.ttl'), ns_w3 + 'TurtleTests/',
     '--', '-a', '-i', 'Turtle',
   ],
   'bad': [
-    files('bad/manifest.ttl'), ns_serdtest + 'bad/',
+    files('extra/bad/manifest.ttl'), ns_serdtest + 'bad/',
   ],
   'bulk': [
-    files('good/manifest.ttl'), ns_serdtest + 'good/',
+    files('extra/good/manifest.ttl'), ns_serdtest + 'good/',
     '--', '-b',
   ],
   'full': [
-    files('full/manifest.ttl'), ns_serdtest + 'full/',
+    files('extra/full/manifest.ttl'), ns_serdtest + 'full/',
     '--', '-f',
   ],
   'good': [
-    files('good/manifest.ttl'), ns_serdtest + 'good/',
+    files('extra/good/manifest.ttl'), ns_serdtest + 'good/',
   ],
   'lax.lax': [
     '--lax',
-    files('lax/manifest.ttl'), ns_serdtest + 'lax/',
+    files('extra/lax/manifest.ttl'), ns_serdtest + 'lax/',
     '--', '-l',
   ],
   'lax.strict': [
-    files('lax/manifest.ttl'), ns_serdtest + 'lax/',
+    files('extra/lax/manifest.ttl'), ns_serdtest + 'lax/',
   ],
   'prefix.add': [
     '--reverse',
-    files('prefix/manifest.ttl'), ns_serdtest + 'prefix/',
+    files('extra/prefix/manifest.ttl'), ns_serdtest + 'prefix/',
     '--', '-p', 'test',
   ],
   'prefix.remove': [
-    files('prefix/manifest.ttl'), ns_serdtest + 'prefix/',
+    files('extra/prefix/manifest.ttl'), ns_serdtest + 'prefix/',
     '--', '-c', 'test',
   ],
   'pretty': [
-    files('pretty/manifest.ttl'), ns_serdtest + 'pretty/',
+    files('extra/pretty/manifest.ttl'), ns_serdtest + 'pretty/',
   ],
   'qualify': [
-    files('qualify/manifest.ttl'), ns_serdtest + 'qualify/',
+    files('extra/qualify/manifest.ttl'), ns_serdtest + 'qualify/',
     '--', '-i', 'turtle', # Just for coverage
   ],
   'root': [
-    files('root/manifest.ttl'), ns_serdtest + 'root/',
+    files('extra/root/manifest.ttl'), ns_serdtest + 'root/',
     '--', '-r', 'http://example.org/top/root/',
   ],
 }
diff --git a/test/NQuadsTests/README b/test/w3c/NQuadsTests/README
index 7aef79dd..7aef79dd 100644
--- a/test/NQuadsTests/README
+++ b/test/w3c/NQuadsTests/README
diff --git a/test/NQuadsTests/comment_following_triple.nq b/test/w3c/NQuadsTests/comment_following_triple.nq
index 5619459a..5619459a 100644
--- a/test/NQuadsTests/comment_following_triple.nq
+++ b/test/w3c/NQuadsTests/comment_following_triple.nq
diff --git a/test/NQuadsTests/langtagged_string.nq b/test/w3c/NQuadsTests/langtagged_string.nq
index 1bddb04e..1bddb04e 100644
--- a/test/NQuadsTests/langtagged_string.nq
+++ b/test/w3c/NQuadsTests/langtagged_string.nq
diff --git a/test/NQuadsTests/lantag_with_subtag.nq b/test/w3c/NQuadsTests/lantag_with_subtag.nq
index 629cbf42..629cbf42 100644
--- a/test/NQuadsTests/lantag_with_subtag.nq
+++ b/test/w3c/NQuadsTests/lantag_with_subtag.nq
diff --git a/test/NQuadsTests/literal.nq b/test/w3c/NQuadsTests/literal.nq
index 3aba89e4..3aba89e4 100644
--- a/test/NQuadsTests/literal.nq
+++ b/test/w3c/NQuadsTests/literal.nq
diff --git a/test/NQuadsTests/literal_all_controls.nq b/test/w3c/NQuadsTests/literal_all_controls.nq
index 91c8af14..91c8af14 100644
--- a/test/NQuadsTests/literal_all_controls.nq
+++ b/test/w3c/NQuadsTests/literal_all_controls.nq
diff --git a/test/NQuadsTests/literal_all_punctuation.nq b/test/w3c/NQuadsTests/literal_all_punctuation.nq
index c25d818f..c25d818f 100644
--- a/test/NQuadsTests/literal_all_punctuation.nq
+++ b/test/w3c/NQuadsTests/literal_all_punctuation.nq
diff --git a/test/NQuadsTests/literal_ascii_boundaries.nq b/test/w3c/NQuadsTests/literal_ascii_boundaries.nq
index 7a4dc717..7a4dc717 100644
--- a/test/NQuadsTests/literal_ascii_boundaries.nq
+++ b/test/w3c/NQuadsTests/literal_ascii_boundaries.nq
diff --git a/test/NQuadsTests/literal_false.nq b/test/w3c/NQuadsTests/literal_false.nq
index 5bbbae84..5bbbae84 100644
--- a/test/NQuadsTests/literal_false.nq
+++ b/test/w3c/NQuadsTests/literal_false.nq
diff --git a/test/NQuadsTests/literal_true.nq b/test/w3c/NQuadsTests/literal_true.nq
index 054b229f..054b229f 100644
--- a/test/NQuadsTests/literal_true.nq
+++ b/test/w3c/NQuadsTests/literal_true.nq
diff --git a/test/NQuadsTests/literal_with_2_dquotes.nq b/test/w3c/NQuadsTests/literal_with_2_dquotes.nq
index 3e69dc10..3e69dc10 100644
--- a/test/NQuadsTests/literal_with_2_dquotes.nq
+++ b/test/w3c/NQuadsTests/literal_with_2_dquotes.nq
diff --git a/test/NQuadsTests/literal_with_2_squotes.nq b/test/w3c/NQuadsTests/literal_with_2_squotes.nq
index 8ddc52e8..8ddc52e8 100644
--- a/test/NQuadsTests/literal_with_2_squotes.nq
+++ b/test/w3c/NQuadsTests/literal_with_2_squotes.nq
diff --git a/test/NQuadsTests/literal_with_BACKSPACE.nq b/test/w3c/NQuadsTests/literal_with_BACKSPACE.nq
index 339013df..339013df 100644
--- a/test/NQuadsTests/literal_with_BACKSPACE.nq
+++ b/test/w3c/NQuadsTests/literal_with_BACKSPACE.nq
diff --git a/test/NQuadsTests/literal_with_CARRIAGE_RETURN.nq b/test/w3c/NQuadsTests/literal_with_CARRIAGE_RETURN.nq
index 91b85c89..91b85c89 100644
--- a/test/NQuadsTests/literal_with_CARRIAGE_RETURN.nq
+++ b/test/w3c/NQuadsTests/literal_with_CARRIAGE_RETURN.nq
diff --git a/test/NQuadsTests/literal_with_CHARACTER_TABULATION.nq b/test/w3c/NQuadsTests/literal_with_CHARACTER_TABULATION.nq
index a6a9d9f0..a6a9d9f0 100644
--- a/test/NQuadsTests/literal_with_CHARACTER_TABULATION.nq
+++ b/test/w3c/NQuadsTests/literal_with_CHARACTER_TABULATION.nq
diff --git a/test/NQuadsTests/literal_with_FORM_FEED.nq b/test/w3c/NQuadsTests/literal_with_FORM_FEED.nq
index 10d2c6d7..10d2c6d7 100644
--- a/test/NQuadsTests/literal_with_FORM_FEED.nq
+++ b/test/w3c/NQuadsTests/literal_with_FORM_FEED.nq
diff --git a/test/NQuadsTests/literal_with_LINE_FEED.nq b/test/w3c/NQuadsTests/literal_with_LINE_FEED.nq
index 462f97ac..462f97ac 100644
--- a/test/NQuadsTests/literal_with_LINE_FEED.nq
+++ b/test/w3c/NQuadsTests/literal_with_LINE_FEED.nq
diff --git a/test/NQuadsTests/literal_with_REVERSE_SOLIDUS.nq b/test/w3c/NQuadsTests/literal_with_REVERSE_SOLIDUS.nq
index ebc846ed..ebc846ed 100644
--- a/test/NQuadsTests/literal_with_REVERSE_SOLIDUS.nq
+++ b/test/w3c/NQuadsTests/literal_with_REVERSE_SOLIDUS.nq
diff --git a/test/NQuadsTests/literal_with_REVERSE_SOLIDUS2.nq b/test/w3c/NQuadsTests/literal_with_REVERSE_SOLIDUS2.nq
index 586e364d..586e364d 100644
--- a/test/NQuadsTests/literal_with_REVERSE_SOLIDUS2.nq
+++ b/test/w3c/NQuadsTests/literal_with_REVERSE_SOLIDUS2.nq
diff --git a/test/NQuadsTests/literal_with_UTF8_boundaries.nq b/test/w3c/NQuadsTests/literal_with_UTF8_boundaries.nq
index 0e1616db..0e1616db 100644
--- a/test/NQuadsTests/literal_with_UTF8_boundaries.nq
+++ b/test/w3c/NQuadsTests/literal_with_UTF8_boundaries.nq
diff --git a/test/NQuadsTests/literal_with_dquote.nq b/test/w3c/NQuadsTests/literal_with_dquote.nq
index 05a1fd3a..05a1fd3a 100644
--- a/test/NQuadsTests/literal_with_dquote.nq
+++ b/test/w3c/NQuadsTests/literal_with_dquote.nq
diff --git a/test/NQuadsTests/literal_with_numeric_escape4.nq b/test/w3c/NQuadsTests/literal_with_numeric_escape4.nq
index 16f0a036..16f0a036 100644
--- a/test/NQuadsTests/literal_with_numeric_escape4.nq
+++ b/test/w3c/NQuadsTests/literal_with_numeric_escape4.nq
diff --git a/test/NQuadsTests/literal_with_numeric_escape8.nq b/test/w3c/NQuadsTests/literal_with_numeric_escape8.nq
index e909a79d..e909a79d 100644
--- a/test/NQuadsTests/literal_with_numeric_escape8.nq
+++ b/test/w3c/NQuadsTests/literal_with_numeric_escape8.nq
diff --git a/test/NQuadsTests/literal_with_squote.nq b/test/w3c/NQuadsTests/literal_with_squote.nq
index acf7f58f..acf7f58f 100644
--- a/test/NQuadsTests/literal_with_squote.nq
+++ b/test/w3c/NQuadsTests/literal_with_squote.nq
diff --git a/test/NQuadsTests/manifest.ttl b/test/w3c/NQuadsTests/manifest.ttl
index eb5f5508..eb5f5508 100644
--- a/test/NQuadsTests/manifest.ttl
+++ b/test/w3c/NQuadsTests/manifest.ttl
diff --git a/test/NQuadsTests/minimal_whitespace.nq b/test/w3c/NQuadsTests/minimal_whitespace.nq
index e9e3a801..e9e3a801 100644
--- a/test/NQuadsTests/minimal_whitespace.nq
+++ b/test/w3c/NQuadsTests/minimal_whitespace.nq
diff --git a/test/NQuadsTests/nq-syntax-bad-literal-01.nq b/test/w3c/NQuadsTests/nq-syntax-bad-literal-01.nq
index bb17eb37..bb17eb37 100644
--- a/test/NQuadsTests/nq-syntax-bad-literal-01.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bad-literal-01.nq
diff --git a/test/NQuadsTests/nq-syntax-bad-literal-02.nq b/test/w3c/NQuadsTests/nq-syntax-bad-literal-02.nq
index ea303b28..ea303b28 100644
--- a/test/NQuadsTests/nq-syntax-bad-literal-02.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bad-literal-02.nq
diff --git a/test/NQuadsTests/nq-syntax-bad-literal-03.nq b/test/w3c/NQuadsTests/nq-syntax-bad-literal-03.nq
index 854b867f..854b867f 100644
--- a/test/NQuadsTests/nq-syntax-bad-literal-03.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bad-literal-03.nq
diff --git a/test/NQuadsTests/nq-syntax-bad-quint-01.nq b/test/w3c/NQuadsTests/nq-syntax-bad-quint-01.nq
index 52b7581e..52b7581e 100644
--- a/test/NQuadsTests/nq-syntax-bad-quint-01.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bad-quint-01.nq
diff --git a/test/NQuadsTests/nq-syntax-bad-uri-01.nq b/test/w3c/NQuadsTests/nq-syntax-bad-uri-01.nq
index 3bf4dbd0..3bf4dbd0 100644
--- a/test/NQuadsTests/nq-syntax-bad-uri-01.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bad-uri-01.nq
diff --git a/test/NQuadsTests/nq-syntax-bnode-01.nq b/test/w3c/NQuadsTests/nq-syntax-bnode-01.nq
index b7acbd5c..b7acbd5c 100644
--- a/test/NQuadsTests/nq-syntax-bnode-01.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bnode-01.nq
diff --git a/test/NQuadsTests/nq-syntax-bnode-02.nq b/test/w3c/NQuadsTests/nq-syntax-bnode-02.nq
index 07c92637..07c92637 100644
--- a/test/NQuadsTests/nq-syntax-bnode-02.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bnode-02.nq
diff --git a/test/NQuadsTests/nq-syntax-bnode-03.nq b/test/w3c/NQuadsTests/nq-syntax-bnode-03.nq
index 5f89bd96..5f89bd96 100644
--- a/test/NQuadsTests/nq-syntax-bnode-03.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bnode-03.nq
diff --git a/test/NQuadsTests/nq-syntax-bnode-04.nq b/test/w3c/NQuadsTests/nq-syntax-bnode-04.nq
index f89ca814..f89ca814 100644
--- a/test/NQuadsTests/nq-syntax-bnode-04.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bnode-04.nq
diff --git a/test/NQuadsTests/nq-syntax-bnode-05.nq b/test/w3c/NQuadsTests/nq-syntax-bnode-05.nq
index 9bb45ce6..9bb45ce6 100644
--- a/test/NQuadsTests/nq-syntax-bnode-05.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bnode-05.nq
diff --git a/test/NQuadsTests/nq-syntax-bnode-06.nq b/test/w3c/NQuadsTests/nq-syntax-bnode-06.nq
index 194ffdc2..194ffdc2 100644
--- a/test/NQuadsTests/nq-syntax-bnode-06.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-bnode-06.nq
diff --git a/test/NQuadsTests/nq-syntax-uri-01.nq b/test/w3c/NQuadsTests/nq-syntax-uri-01.nq
index 3026e122..3026e122 100644
--- a/test/NQuadsTests/nq-syntax-uri-01.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-uri-01.nq
diff --git a/test/NQuadsTests/nq-syntax-uri-02.nq b/test/w3c/NQuadsTests/nq-syntax-uri-02.nq
index 1590ab94..1590ab94 100644
--- a/test/NQuadsTests/nq-syntax-uri-02.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-uri-02.nq
diff --git a/test/NQuadsTests/nq-syntax-uri-03.nq b/test/w3c/NQuadsTests/nq-syntax-uri-03.nq
index 4592edcb..4592edcb 100644
--- a/test/NQuadsTests/nq-syntax-uri-03.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-uri-03.nq
diff --git a/test/NQuadsTests/nq-syntax-uri-04.nq b/test/w3c/NQuadsTests/nq-syntax-uri-04.nq
index f7b834ab..f7b834ab 100644
--- a/test/NQuadsTests/nq-syntax-uri-04.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-uri-04.nq
diff --git a/test/NQuadsTests/nq-syntax-uri-05.nq b/test/w3c/NQuadsTests/nq-syntax-uri-05.nq
index cf5a0ee2..cf5a0ee2 100644
--- a/test/NQuadsTests/nq-syntax-uri-05.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-uri-05.nq
diff --git a/test/NQuadsTests/nq-syntax-uri-06.nq b/test/w3c/NQuadsTests/nq-syntax-uri-06.nq
index 65e77033..65e77033 100644
--- a/test/NQuadsTests/nq-syntax-uri-06.nq
+++ b/test/w3c/NQuadsTests/nq-syntax-uri-06.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-base-01.nq b/test/w3c/NQuadsTests/nt-syntax-bad-base-01.nq
index dff1b3b4..dff1b3b4 100644
--- a/test/NQuadsTests/nt-syntax-bad-base-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-base-01.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-esc-01.nq b/test/w3c/NQuadsTests/nt-syntax-bad-esc-01.nq
index f7a88add..f7a88add 100644
--- a/test/NQuadsTests/nt-syntax-bad-esc-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-esc-01.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-esc-02.nq b/test/w3c/NQuadsTests/nt-syntax-bad-esc-02.nq
index 72711d49..72711d49 100644
--- a/test/NQuadsTests/nt-syntax-bad-esc-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-esc-02.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-esc-03.nq b/test/w3c/NQuadsTests/nt-syntax-bad-esc-03.nq
index 3a4522fc..3a4522fc 100644
--- a/test/NQuadsTests/nt-syntax-bad-esc-03.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-esc-03.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-lang-01.nq b/test/w3c/NQuadsTests/nt-syntax-bad-lang-01.nq
index a4d952c8..a4d952c8 100644
--- a/test/NQuadsTests/nt-syntax-bad-lang-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-lang-01.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-num-01.nq b/test/w3c/NQuadsTests/nt-syntax-bad-num-01.nq
index 2be6f516..2be6f516 100644
--- a/test/NQuadsTests/nt-syntax-bad-num-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-num-01.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-num-02.nq b/test/w3c/NQuadsTests/nt-syntax-bad-num-02.nq
index e1d5b06c..e1d5b06c 100644
--- a/test/NQuadsTests/nt-syntax-bad-num-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-num-02.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-num-03.nq b/test/w3c/NQuadsTests/nt-syntax-bad-num-03.nq
index a9be82fc..a9be82fc 100644
--- a/test/NQuadsTests/nt-syntax-bad-num-03.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-num-03.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-prefix-01.nq b/test/w3c/NQuadsTests/nt-syntax-bad-prefix-01.nq
index 89e08cc7..89e08cc7 100644
--- a/test/NQuadsTests/nt-syntax-bad-prefix-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-prefix-01.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-string-01.nq b/test/w3c/NQuadsTests/nt-syntax-bad-string-01.nq
index 988af87a..988af87a 100644
--- a/test/NQuadsTests/nt-syntax-bad-string-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-string-01.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-string-02.nq b/test/w3c/NQuadsTests/nt-syntax-bad-string-02.nq
index e1d5b06c..e1d5b06c 100644
--- a/test/NQuadsTests/nt-syntax-bad-string-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-string-02.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-string-03.nq b/test/w3c/NQuadsTests/nt-syntax-bad-string-03.nq
index 64d343da..64d343da 100644
--- a/test/NQuadsTests/nt-syntax-bad-string-03.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-string-03.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-string-04.nq b/test/w3c/NQuadsTests/nt-syntax-bad-string-04.nq
index af4ff28f..af4ff28f 100644
--- a/test/NQuadsTests/nt-syntax-bad-string-04.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-string-04.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-string-05.nq b/test/w3c/NQuadsTests/nt-syntax-bad-string-05.nq
index 75ad4b2b..75ad4b2b 100644
--- a/test/NQuadsTests/nt-syntax-bad-string-05.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-string-05.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-string-06.nq b/test/w3c/NQuadsTests/nt-syntax-bad-string-06.nq
index 56dcbc60..56dcbc60 100644
--- a/test/NQuadsTests/nt-syntax-bad-string-06.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-string-06.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-string-07.nq b/test/w3c/NQuadsTests/nt-syntax-bad-string-07.nq
index 7f1ee800..7f1ee800 100644
--- a/test/NQuadsTests/nt-syntax-bad-string-07.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-string-07.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-struct-01.nq b/test/w3c/NQuadsTests/nt-syntax-bad-struct-01.nq
index d546d564..d546d564 100644
--- a/test/NQuadsTests/nt-syntax-bad-struct-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-struct-01.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-struct-02.nq b/test/w3c/NQuadsTests/nt-syntax-bad-struct-02.nq
index 1f388c6e..1f388c6e 100644
--- a/test/NQuadsTests/nt-syntax-bad-struct-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-struct-02.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-uri-01.nq b/test/w3c/NQuadsTests/nt-syntax-bad-uri-01.nq
index 0e69dc0c..0e69dc0c 100644
--- a/test/NQuadsTests/nt-syntax-bad-uri-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-uri-01.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-uri-02.nq b/test/w3c/NQuadsTests/nt-syntax-bad-uri-02.nq
index 36d91af9..36d91af9 100644
--- a/test/NQuadsTests/nt-syntax-bad-uri-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-uri-02.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-uri-03.nq b/test/w3c/NQuadsTests/nt-syntax-bad-uri-03.nq
index f512345f..f512345f 100644
--- a/test/NQuadsTests/nt-syntax-bad-uri-03.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-uri-03.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-uri-04.nq b/test/w3c/NQuadsTests/nt-syntax-bad-uri-04.nq
index 5cab062c..5cab062c 100644
--- a/test/NQuadsTests/nt-syntax-bad-uri-04.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-uri-04.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-uri-05.nq b/test/w3c/NQuadsTests/nt-syntax-bad-uri-05.nq
index be0a21e0..be0a21e0 100644
--- a/test/NQuadsTests/nt-syntax-bad-uri-05.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-uri-05.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-uri-06.nq b/test/w3c/NQuadsTests/nt-syntax-bad-uri-06.nq
index b4e64592..b4e64592 100644
--- a/test/NQuadsTests/nt-syntax-bad-uri-06.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-uri-06.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-uri-07.nq b/test/w3c/NQuadsTests/nt-syntax-bad-uri-07.nq
index 74534dde..74534dde 100644
--- a/test/NQuadsTests/nt-syntax-bad-uri-07.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-uri-07.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-uri-08.nq b/test/w3c/NQuadsTests/nt-syntax-bad-uri-08.nq
index 41a953d4..41a953d4 100644
--- a/test/NQuadsTests/nt-syntax-bad-uri-08.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-uri-08.nq
diff --git a/test/NQuadsTests/nt-syntax-bad-uri-09.nq b/test/w3c/NQuadsTests/nt-syntax-bad-uri-09.nq
index 58821da8..58821da8 100644
--- a/test/NQuadsTests/nt-syntax-bad-uri-09.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bad-uri-09.nq
diff --git a/test/NQuadsTests/nt-syntax-bnode-01.nq b/test/w3c/NQuadsTests/nt-syntax-bnode-01.nq
index 5fb0d0f9..5fb0d0f9 100644
--- a/test/NQuadsTests/nt-syntax-bnode-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bnode-01.nq
diff --git a/test/NQuadsTests/nt-syntax-bnode-02.nq b/test/w3c/NQuadsTests/nt-syntax-bnode-02.nq
index 737e81b4..737e81b4 100644
--- a/test/NQuadsTests/nt-syntax-bnode-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bnode-02.nq
diff --git a/test/NQuadsTests/nt-syntax-bnode-03.nq b/test/w3c/NQuadsTests/nt-syntax-bnode-03.nq
index 1a1f1c9f..1a1f1c9f 100644
--- a/test/NQuadsTests/nt-syntax-bnode-03.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-bnode-03.nq
diff --git a/test/NQuadsTests/nt-syntax-datatypes-01.nq b/test/w3c/NQuadsTests/nt-syntax-datatypes-01.nq
index 91263091..91263091 100644
--- a/test/NQuadsTests/nt-syntax-datatypes-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-datatypes-01.nq
diff --git a/test/NQuadsTests/nt-syntax-datatypes-02.nq b/test/w3c/NQuadsTests/nt-syntax-datatypes-02.nq
index d49cc27d..d49cc27d 100644
--- a/test/NQuadsTests/nt-syntax-datatypes-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-datatypes-02.nq
diff --git a/test/NQuadsTests/nt-syntax-file-01.nq b/test/w3c/NQuadsTests/nt-syntax-file-01.nq
index e69de29b..e69de29b 100644
--- a/test/NQuadsTests/nt-syntax-file-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-file-01.nq
diff --git a/test/NQuadsTests/nt-syntax-file-02.nq b/test/w3c/NQuadsTests/nt-syntax-file-02.nq
index e6d327d5..e6d327d5 100644
--- a/test/NQuadsTests/nt-syntax-file-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-file-02.nq
diff --git a/test/NQuadsTests/nt-syntax-file-03.nq b/test/w3c/NQuadsTests/nt-syntax-file-03.nq
index a9ca0358..a9ca0358 100644
--- a/test/NQuadsTests/nt-syntax-file-03.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-file-03.nq
diff --git a/test/NQuadsTests/nt-syntax-str-esc-01.nq b/test/w3c/NQuadsTests/nt-syntax-str-esc-01.nq
index 3925f2ec..3925f2ec 100644
--- a/test/NQuadsTests/nt-syntax-str-esc-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-str-esc-01.nq
diff --git a/test/NQuadsTests/nt-syntax-str-esc-02.nq b/test/w3c/NQuadsTests/nt-syntax-str-esc-02.nq
index e7d032f0..e7d032f0 100644
--- a/test/NQuadsTests/nt-syntax-str-esc-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-str-esc-02.nq
diff --git a/test/NQuadsTests/nt-syntax-str-esc-03.nq b/test/w3c/NQuadsTests/nt-syntax-str-esc-03.nq
index b8588c79..b8588c79 100644
--- a/test/NQuadsTests/nt-syntax-str-esc-03.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-str-esc-03.nq
diff --git a/test/NQuadsTests/nt-syntax-string-01.nq b/test/w3c/NQuadsTests/nt-syntax-string-01.nq
index 5333aefe..5333aefe 100644
--- a/test/NQuadsTests/nt-syntax-string-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-string-01.nq
diff --git a/test/NQuadsTests/nt-syntax-string-02.nq b/test/w3c/NQuadsTests/nt-syntax-string-02.nq
index 1ab55a33..1ab55a33 100644
--- a/test/NQuadsTests/nt-syntax-string-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-string-02.nq
diff --git a/test/NQuadsTests/nt-syntax-string-03.nq b/test/w3c/NQuadsTests/nt-syntax-string-03.nq
index b34ca0f6..b34ca0f6 100644
--- a/test/NQuadsTests/nt-syntax-string-03.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-string-03.nq
diff --git a/test/NQuadsTests/nt-syntax-subm-01.nq b/test/w3c/NQuadsTests/nt-syntax-subm-01.nq
index 91b49889..91b49889 100644
--- a/test/NQuadsTests/nt-syntax-subm-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-subm-01.nq
diff --git a/test/NQuadsTests/nt-syntax-uri-01.nq b/test/w3c/NQuadsTests/nt-syntax-uri-01.nq
index 02e6ba98..02e6ba98 100644
--- a/test/NQuadsTests/nt-syntax-uri-01.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-uri-01.nq
diff --git a/test/NQuadsTests/nt-syntax-uri-02.nq b/test/w3c/NQuadsTests/nt-syntax-uri-02.nq
index 664feea1..664feea1 100644
--- a/test/NQuadsTests/nt-syntax-uri-02.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-uri-02.nq
diff --git a/test/NQuadsTests/nt-syntax-uri-03.nq b/test/w3c/NQuadsTests/nt-syntax-uri-03.nq
index b5aeb26e..b5aeb26e 100644
--- a/test/NQuadsTests/nt-syntax-uri-03.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-uri-03.nq
diff --git a/test/NQuadsTests/nt-syntax-uri-04.nq b/test/w3c/NQuadsTests/nt-syntax-uri-04.nq
index 49bacca7..49bacca7 100644
--- a/test/NQuadsTests/nt-syntax-uri-04.nq
+++ b/test/w3c/NQuadsTests/nt-syntax-uri-04.nq
diff --git a/test/NTriplesTests/README b/test/w3c/NTriplesTests/README
index 12d8bf16..12d8bf16 100644
--- a/test/NTriplesTests/README
+++ b/test/w3c/NTriplesTests/README
diff --git a/test/NTriplesTests/comment_following_triple.nt b/test/w3c/NTriplesTests/comment_following_triple.nt
index 5619459a..5619459a 100644
--- a/test/NTriplesTests/comment_following_triple.nt
+++ b/test/w3c/NTriplesTests/comment_following_triple.nt
diff --git a/test/NTriplesTests/langtagged_string.nt b/test/w3c/NTriplesTests/langtagged_string.nt
index 1bddb04e..1bddb04e 100644
--- a/test/NTriplesTests/langtagged_string.nt
+++ b/test/w3c/NTriplesTests/langtagged_string.nt
diff --git a/test/NTriplesTests/lantag_with_subtag.nt b/test/w3c/NTriplesTests/lantag_with_subtag.nt
index 629cbf42..629cbf42 100644
--- a/test/NTriplesTests/lantag_with_subtag.nt
+++ b/test/w3c/NTriplesTests/lantag_with_subtag.nt
diff --git a/test/NTriplesTests/literal.nt b/test/w3c/NTriplesTests/literal.nt
index 3aba89e4..3aba89e4 100644
--- a/test/NTriplesTests/literal.nt
+++ b/test/w3c/NTriplesTests/literal.nt
diff --git a/test/NTriplesTests/literal_all_controls.nt b/test/w3c/NTriplesTests/literal_all_controls.nt
index 91c8af14..91c8af14 100644
--- a/test/NTriplesTests/literal_all_controls.nt
+++ b/test/w3c/NTriplesTests/literal_all_controls.nt
diff --git a/test/NTriplesTests/literal_all_punctuation.nt b/test/w3c/NTriplesTests/literal_all_punctuation.nt
index c25d818f..c25d818f 100644
--- a/test/NTriplesTests/literal_all_punctuation.nt
+++ b/test/w3c/NTriplesTests/literal_all_punctuation.nt
diff --git a/test/NTriplesTests/literal_ascii_boundaries.nt b/test/w3c/NTriplesTests/literal_ascii_boundaries.nt
index 7a4dc717..7a4dc717 100644
--- a/test/NTriplesTests/literal_ascii_boundaries.nt
+++ b/test/w3c/NTriplesTests/literal_ascii_boundaries.nt
diff --git a/test/NTriplesTests/literal_false.nt b/test/w3c/NTriplesTests/literal_false.nt
index 5bbbae84..5bbbae84 100644
--- a/test/NTriplesTests/literal_false.nt
+++ b/test/w3c/NTriplesTests/literal_false.nt
diff --git a/test/NTriplesTests/literal_true.nt b/test/w3c/NTriplesTests/literal_true.nt
index 054b229f..054b229f 100644
--- a/test/NTriplesTests/literal_true.nt
+++ b/test/w3c/NTriplesTests/literal_true.nt
diff --git a/test/NTriplesTests/literal_with_2_dquotes.nt b/test/w3c/NTriplesTests/literal_with_2_dquotes.nt
index 3e69dc10..3e69dc10 100644
--- a/test/NTriplesTests/literal_with_2_dquotes.nt
+++ b/test/w3c/NTriplesTests/literal_with_2_dquotes.nt
diff --git a/test/NTriplesTests/literal_with_2_squotes.nt b/test/w3c/NTriplesTests/literal_with_2_squotes.nt
index 8ddc52e8..8ddc52e8 100644
--- a/test/NTriplesTests/literal_with_2_squotes.nt
+++ b/test/w3c/NTriplesTests/literal_with_2_squotes.nt
diff --git a/test/NTriplesTests/literal_with_BACKSPACE.nt b/test/w3c/NTriplesTests/literal_with_BACKSPACE.nt
index 339013df..339013df 100644
--- a/test/NTriplesTests/literal_with_BACKSPACE.nt
+++ b/test/w3c/NTriplesTests/literal_with_BACKSPACE.nt
diff --git a/test/NTriplesTests/literal_with_CARRIAGE_RETURN.nt b/test/w3c/NTriplesTests/literal_with_CARRIAGE_RETURN.nt
index 91b85c89..91b85c89 100644
--- a/test/NTriplesTests/literal_with_CARRIAGE_RETURN.nt
+++ b/test/w3c/NTriplesTests/literal_with_CARRIAGE_RETURN.nt
diff --git a/test/NTriplesTests/literal_with_CHARACTER_TABULATION.nt b/test/w3c/NTriplesTests/literal_with_CHARACTER_TABULATION.nt
index a6a9d9f0..a6a9d9f0 100644
--- a/test/NTriplesTests/literal_with_CHARACTER_TABULATION.nt
+++ b/test/w3c/NTriplesTests/literal_with_CHARACTER_TABULATION.nt
diff --git a/test/NTriplesTests/literal_with_FORM_FEED.nt b/test/w3c/NTriplesTests/literal_with_FORM_FEED.nt
index 10d2c6d7..10d2c6d7 100644
--- a/test/NTriplesTests/literal_with_FORM_FEED.nt
+++ b/test/w3c/NTriplesTests/literal_with_FORM_FEED.nt
diff --git a/test/NTriplesTests/literal_with_LINE_FEED.nt b/test/w3c/NTriplesTests/literal_with_LINE_FEED.nt
index 462f97ac..462f97ac 100644
--- a/test/NTriplesTests/literal_with_LINE_FEED.nt
+++ b/test/w3c/NTriplesTests/literal_with_LINE_FEED.nt
diff --git a/test/NTriplesTests/literal_with_REVERSE_SOLIDUS.nt b/test/w3c/NTriplesTests/literal_with_REVERSE_SOLIDUS.nt
index ebc846ed..ebc846ed 100644
--- a/test/NTriplesTests/literal_with_REVERSE_SOLIDUS.nt
+++ b/test/w3c/NTriplesTests/literal_with_REVERSE_SOLIDUS.nt
diff --git a/test/NTriplesTests/literal_with_REVERSE_SOLIDUS2.nt b/test/w3c/NTriplesTests/literal_with_REVERSE_SOLIDUS2.nt
index 586e364d..586e364d 100644
--- a/test/NTriplesTests/literal_with_REVERSE_SOLIDUS2.nt
+++ b/test/w3c/NTriplesTests/literal_with_REVERSE_SOLIDUS2.nt
diff --git a/test/NTriplesTests/literal_with_UTF8_boundaries.nt b/test/w3c/NTriplesTests/literal_with_UTF8_boundaries.nt
index 0e1616db..0e1616db 100644
--- a/test/NTriplesTests/literal_with_UTF8_boundaries.nt
+++ b/test/w3c/NTriplesTests/literal_with_UTF8_boundaries.nt
diff --git a/test/NTriplesTests/literal_with_dquote.nt b/test/w3c/NTriplesTests/literal_with_dquote.nt
index 05a1fd3a..05a1fd3a 100644
--- a/test/NTriplesTests/literal_with_dquote.nt
+++ b/test/w3c/NTriplesTests/literal_with_dquote.nt
diff --git a/test/NTriplesTests/literal_with_numeric_escape4.nt b/test/w3c/NTriplesTests/literal_with_numeric_escape4.nt
index 16f0a036..16f0a036 100644
--- a/test/NTriplesTests/literal_with_numeric_escape4.nt
+++ b/test/w3c/NTriplesTests/literal_with_numeric_escape4.nt
diff --git a/test/NTriplesTests/literal_with_numeric_escape8.nt b/test/w3c/NTriplesTests/literal_with_numeric_escape8.nt
index e909a79d..e909a79d 100644
--- a/test/NTriplesTests/literal_with_numeric_escape8.nt
+++ b/test/w3c/NTriplesTests/literal_with_numeric_escape8.nt
diff --git a/test/NTriplesTests/literal_with_squote.nt b/test/w3c/NTriplesTests/literal_with_squote.nt
index acf7f58f..acf7f58f 100644
--- a/test/NTriplesTests/literal_with_squote.nt
+++ b/test/w3c/NTriplesTests/literal_with_squote.nt
diff --git a/test/NTriplesTests/manifest.ttl b/test/w3c/NTriplesTests/manifest.ttl
index 246561cb..246561cb 100644
--- a/test/NTriplesTests/manifest.ttl
+++ b/test/w3c/NTriplesTests/manifest.ttl
diff --git a/test/NTriplesTests/minimal_whitespace.nt b/test/w3c/NTriplesTests/minimal_whitespace.nt
index e9e3a801..e9e3a801 100644
--- a/test/NTriplesTests/minimal_whitespace.nt
+++ b/test/w3c/NTriplesTests/minimal_whitespace.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-base-01.nt b/test/w3c/NTriplesTests/nt-syntax-bad-base-01.nt
index dff1b3b4..dff1b3b4 100644
--- a/test/NTriplesTests/nt-syntax-bad-base-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-base-01.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-esc-01.nt b/test/w3c/NTriplesTests/nt-syntax-bad-esc-01.nt
index f7a88add..f7a88add 100644
--- a/test/NTriplesTests/nt-syntax-bad-esc-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-esc-01.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-esc-02.nt b/test/w3c/NTriplesTests/nt-syntax-bad-esc-02.nt
index 72711d49..72711d49 100644
--- a/test/NTriplesTests/nt-syntax-bad-esc-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-esc-02.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-esc-03.nt b/test/w3c/NTriplesTests/nt-syntax-bad-esc-03.nt
index 3a4522fc..3a4522fc 100644
--- a/test/NTriplesTests/nt-syntax-bad-esc-03.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-esc-03.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-lang-01.nt b/test/w3c/NTriplesTests/nt-syntax-bad-lang-01.nt
index a4d952c8..a4d952c8 100644
--- a/test/NTriplesTests/nt-syntax-bad-lang-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-lang-01.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-num-01.nt b/test/w3c/NTriplesTests/nt-syntax-bad-num-01.nt
index 2be6f516..2be6f516 100644
--- a/test/NTriplesTests/nt-syntax-bad-num-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-num-01.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-num-02.nt b/test/w3c/NTriplesTests/nt-syntax-bad-num-02.nt
index e1d5b06c..e1d5b06c 100644
--- a/test/NTriplesTests/nt-syntax-bad-num-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-num-02.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-num-03.nt b/test/w3c/NTriplesTests/nt-syntax-bad-num-03.nt
index a9be82fc..a9be82fc 100644
--- a/test/NTriplesTests/nt-syntax-bad-num-03.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-num-03.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-prefix-01.nt b/test/w3c/NTriplesTests/nt-syntax-bad-prefix-01.nt
index 89e08cc7..89e08cc7 100644
--- a/test/NTriplesTests/nt-syntax-bad-prefix-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-prefix-01.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-string-01.nt b/test/w3c/NTriplesTests/nt-syntax-bad-string-01.nt
index 988af87a..988af87a 100644
--- a/test/NTriplesTests/nt-syntax-bad-string-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-string-01.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-string-02.nt b/test/w3c/NTriplesTests/nt-syntax-bad-string-02.nt
index e1d5b06c..e1d5b06c 100644
--- a/test/NTriplesTests/nt-syntax-bad-string-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-string-02.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-string-03.nt b/test/w3c/NTriplesTests/nt-syntax-bad-string-03.nt
index 64d343da..64d343da 100644
--- a/test/NTriplesTests/nt-syntax-bad-string-03.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-string-03.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-string-04.nt b/test/w3c/NTriplesTests/nt-syntax-bad-string-04.nt
index af4ff28f..af4ff28f 100644
--- a/test/NTriplesTests/nt-syntax-bad-string-04.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-string-04.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-string-05.nt b/test/w3c/NTriplesTests/nt-syntax-bad-string-05.nt
index 75ad4b2b..75ad4b2b 100644
--- a/test/NTriplesTests/nt-syntax-bad-string-05.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-string-05.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-string-06.nt b/test/w3c/NTriplesTests/nt-syntax-bad-string-06.nt
index 56dcbc60..56dcbc60 100644
--- a/test/NTriplesTests/nt-syntax-bad-string-06.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-string-06.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-string-07.nt b/test/w3c/NTriplesTests/nt-syntax-bad-string-07.nt
index 7f1ee800..7f1ee800 100644
--- a/test/NTriplesTests/nt-syntax-bad-string-07.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-string-07.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-struct-01.nt b/test/w3c/NTriplesTests/nt-syntax-bad-struct-01.nt
index d546d564..d546d564 100644
--- a/test/NTriplesTests/nt-syntax-bad-struct-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-struct-01.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-struct-02.nt b/test/w3c/NTriplesTests/nt-syntax-bad-struct-02.nt
index 1f388c6e..1f388c6e 100644
--- a/test/NTriplesTests/nt-syntax-bad-struct-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-struct-02.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-uri-01.nt b/test/w3c/NTriplesTests/nt-syntax-bad-uri-01.nt
index 0e69dc0c..0e69dc0c 100644
--- a/test/NTriplesTests/nt-syntax-bad-uri-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-uri-01.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-uri-02.nt b/test/w3c/NTriplesTests/nt-syntax-bad-uri-02.nt
index 36d91af9..36d91af9 100644
--- a/test/NTriplesTests/nt-syntax-bad-uri-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-uri-02.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-uri-03.nt b/test/w3c/NTriplesTests/nt-syntax-bad-uri-03.nt
index f512345f..f512345f 100644
--- a/test/NTriplesTests/nt-syntax-bad-uri-03.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-uri-03.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-uri-04.nt b/test/w3c/NTriplesTests/nt-syntax-bad-uri-04.nt
index 5cab062c..5cab062c 100644
--- a/test/NTriplesTests/nt-syntax-bad-uri-04.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-uri-04.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-uri-05.nt b/test/w3c/NTriplesTests/nt-syntax-bad-uri-05.nt
index be0a21e0..be0a21e0 100644
--- a/test/NTriplesTests/nt-syntax-bad-uri-05.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-uri-05.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-uri-06.nt b/test/w3c/NTriplesTests/nt-syntax-bad-uri-06.nt
index b4e64592..b4e64592 100644
--- a/test/NTriplesTests/nt-syntax-bad-uri-06.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-uri-06.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-uri-07.nt b/test/w3c/NTriplesTests/nt-syntax-bad-uri-07.nt
index 74534dde..74534dde 100644
--- a/test/NTriplesTests/nt-syntax-bad-uri-07.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-uri-07.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-uri-08.nt b/test/w3c/NTriplesTests/nt-syntax-bad-uri-08.nt
index 41a953d4..41a953d4 100644
--- a/test/NTriplesTests/nt-syntax-bad-uri-08.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-uri-08.nt
diff --git a/test/NTriplesTests/nt-syntax-bad-uri-09.nt b/test/w3c/NTriplesTests/nt-syntax-bad-uri-09.nt
index 58821da8..58821da8 100644
--- a/test/NTriplesTests/nt-syntax-bad-uri-09.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bad-uri-09.nt
diff --git a/test/NTriplesTests/nt-syntax-bnode-01.nt b/test/w3c/NTriplesTests/nt-syntax-bnode-01.nt
index 5fb0d0f9..5fb0d0f9 100644
--- a/test/NTriplesTests/nt-syntax-bnode-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bnode-01.nt
diff --git a/test/NTriplesTests/nt-syntax-bnode-02.nt b/test/w3c/NTriplesTests/nt-syntax-bnode-02.nt
index 737e81b4..737e81b4 100644
--- a/test/NTriplesTests/nt-syntax-bnode-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bnode-02.nt
diff --git a/test/NTriplesTests/nt-syntax-bnode-03.nt b/test/w3c/NTriplesTests/nt-syntax-bnode-03.nt
index 1a1f1c9f..1a1f1c9f 100644
--- a/test/NTriplesTests/nt-syntax-bnode-03.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-bnode-03.nt
diff --git a/test/NTriplesTests/nt-syntax-datatypes-01.nt b/test/w3c/NTriplesTests/nt-syntax-datatypes-01.nt
index 91263091..91263091 100644
--- a/test/NTriplesTests/nt-syntax-datatypes-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-datatypes-01.nt
diff --git a/test/NTriplesTests/nt-syntax-datatypes-02.nt b/test/w3c/NTriplesTests/nt-syntax-datatypes-02.nt
index d49cc27d..d49cc27d 100644
--- a/test/NTriplesTests/nt-syntax-datatypes-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-datatypes-02.nt
diff --git a/test/NTriplesTests/nt-syntax-file-01.nt b/test/w3c/NTriplesTests/nt-syntax-file-01.nt
index e69de29b..e69de29b 100644
--- a/test/NTriplesTests/nt-syntax-file-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-file-01.nt
diff --git a/test/NTriplesTests/nt-syntax-file-02.nt b/test/w3c/NTriplesTests/nt-syntax-file-02.nt
index e6d327d5..e6d327d5 100644
--- a/test/NTriplesTests/nt-syntax-file-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-file-02.nt
diff --git a/test/NTriplesTests/nt-syntax-file-03.nt b/test/w3c/NTriplesTests/nt-syntax-file-03.nt
index a9ca0358..a9ca0358 100644
--- a/test/NTriplesTests/nt-syntax-file-03.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-file-03.nt
diff --git a/test/NTriplesTests/nt-syntax-str-esc-01.nt b/test/w3c/NTriplesTests/nt-syntax-str-esc-01.nt
index 3925f2ec..3925f2ec 100644
--- a/test/NTriplesTests/nt-syntax-str-esc-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-str-esc-01.nt
diff --git a/test/NTriplesTests/nt-syntax-str-esc-02.nt b/test/w3c/NTriplesTests/nt-syntax-str-esc-02.nt
index e7d032f0..e7d032f0 100644
--- a/test/NTriplesTests/nt-syntax-str-esc-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-str-esc-02.nt
diff --git a/test/NTriplesTests/nt-syntax-str-esc-03.nt b/test/w3c/NTriplesTests/nt-syntax-str-esc-03.nt
index b8588c79..b8588c79 100644
--- a/test/NTriplesTests/nt-syntax-str-esc-03.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-str-esc-03.nt
diff --git a/test/NTriplesTests/nt-syntax-string-01.nt b/test/w3c/NTriplesTests/nt-syntax-string-01.nt
index 5333aefe..5333aefe 100644
--- a/test/NTriplesTests/nt-syntax-string-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-string-01.nt
diff --git a/test/NTriplesTests/nt-syntax-string-02.nt b/test/w3c/NTriplesTests/nt-syntax-string-02.nt
index 1ab55a33..1ab55a33 100644
--- a/test/NTriplesTests/nt-syntax-string-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-string-02.nt
diff --git a/test/NTriplesTests/nt-syntax-string-03.nt b/test/w3c/NTriplesTests/nt-syntax-string-03.nt
index b34ca0f6..b34ca0f6 100644
--- a/test/NTriplesTests/nt-syntax-string-03.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-string-03.nt
diff --git a/test/NTriplesTests/nt-syntax-subm-01.nt b/test/w3c/NTriplesTests/nt-syntax-subm-01.nt
index 91b49889..91b49889 100644
--- a/test/NTriplesTests/nt-syntax-subm-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-subm-01.nt
diff --git a/test/NTriplesTests/nt-syntax-uri-01.nt b/test/w3c/NTriplesTests/nt-syntax-uri-01.nt
index 02e6ba98..02e6ba98 100644
--- a/test/NTriplesTests/nt-syntax-uri-01.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-uri-01.nt
diff --git a/test/NTriplesTests/nt-syntax-uri-02.nt b/test/w3c/NTriplesTests/nt-syntax-uri-02.nt
index 664feea1..664feea1 100644
--- a/test/NTriplesTests/nt-syntax-uri-02.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-uri-02.nt
diff --git a/test/NTriplesTests/nt-syntax-uri-03.nt b/test/w3c/NTriplesTests/nt-syntax-uri-03.nt
index b5aeb26e..b5aeb26e 100644
--- a/test/NTriplesTests/nt-syntax-uri-03.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-uri-03.nt
diff --git a/test/NTriplesTests/nt-syntax-uri-04.nt b/test/w3c/NTriplesTests/nt-syntax-uri-04.nt
index 49bacca7..49bacca7 100644
--- a/test/NTriplesTests/nt-syntax-uri-04.nt
+++ b/test/w3c/NTriplesTests/nt-syntax-uri-04.nt
diff --git a/test/TriGTests/HYPHEN_MINUS_in_localName.nq b/test/w3c/TriGTests/HYPHEN_MINUS_in_localName.nq
index 2de67fd4..2de67fd4 100644
--- a/test/TriGTests/HYPHEN_MINUS_in_localName.nq
+++ b/test/w3c/TriGTests/HYPHEN_MINUS_in_localName.nq
diff --git a/test/TriGTests/HYPHEN_MINUS_in_localName.trig b/test/w3c/TriGTests/HYPHEN_MINUS_in_localName.trig
index e93280e9..e93280e9 100644
--- a/test/TriGTests/HYPHEN_MINUS_in_localName.trig
+++ b/test/w3c/TriGTests/HYPHEN_MINUS_in_localName.trig
diff --git a/test/TriGTests/IRIREF_datatype.nq b/test/w3c/TriGTests/IRIREF_datatype.nq
index 2ddce8e3..2ddce8e3 100644
--- a/test/TriGTests/IRIREF_datatype.nq
+++ b/test/w3c/TriGTests/IRIREF_datatype.nq
diff --git a/test/TriGTests/IRIREF_datatype.trig b/test/w3c/TriGTests/IRIREF_datatype.trig
index f8e89b17..f8e89b17 100644
--- a/test/TriGTests/IRIREF_datatype.trig
+++ b/test/w3c/TriGTests/IRIREF_datatype.trig
diff --git a/test/TriGTests/IRI_spo.nq b/test/w3c/TriGTests/IRI_spo.nq
index 9e8bf24d..9e8bf24d 100644
--- a/test/TriGTests/IRI_spo.nq
+++ b/test/w3c/TriGTests/IRI_spo.nq
diff --git a/test/TriGTests/IRI_subject.trig b/test/w3c/TriGTests/IRI_subject.trig
index 0a258598..0a258598 100644
--- a/test/TriGTests/IRI_subject.trig
+++ b/test/w3c/TriGTests/IRI_subject.trig
diff --git a/test/TriGTests/IRI_with_all_punctuation.nq b/test/w3c/TriGTests/IRI_with_all_punctuation.nq
index ea278b6c..ea278b6c 100644
--- a/test/TriGTests/IRI_with_all_punctuation.nq
+++ b/test/w3c/TriGTests/IRI_with_all_punctuation.nq
diff --git a/test/TriGTests/IRI_with_all_punctuation.trig b/test/w3c/TriGTests/IRI_with_all_punctuation.trig
index 4b602a73..4b602a73 100644
--- a/test/TriGTests/IRI_with_all_punctuation.trig
+++ b/test/w3c/TriGTests/IRI_with_all_punctuation.trig
diff --git a/test/TriGTests/IRI_with_eight_digit_numeric_escape.trig b/test/w3c/TriGTests/IRI_with_eight_digit_numeric_escape.trig
index 6042a770..6042a770 100644
--- a/test/TriGTests/IRI_with_eight_digit_numeric_escape.trig
+++ b/test/w3c/TriGTests/IRI_with_eight_digit_numeric_escape.trig
diff --git a/test/TriGTests/IRI_with_four_digit_numeric_escape.trig b/test/w3c/TriGTests/IRI_with_four_digit_numeric_escape.trig
index 6c659d06..6c659d06 100644
--- a/test/TriGTests/IRI_with_four_digit_numeric_escape.trig
+++ b/test/w3c/TriGTests/IRI_with_four_digit_numeric_escape.trig
diff --git a/test/TriGTests/LICENSE b/test/w3c/TriGTests/LICENSE
index 3c128537..3c128537 100644
--- a/test/TriGTests/LICENSE
+++ b/test/w3c/TriGTests/LICENSE
diff --git a/test/TriGTests/LITERAL1.nq b/test/w3c/TriGTests/LITERAL1.nq
index 97b680a5..97b680a5 100644
--- a/test/TriGTests/LITERAL1.nq
+++ b/test/w3c/TriGTests/LITERAL1.nq
diff --git a/test/TriGTests/LITERAL1.trig b/test/w3c/TriGTests/LITERAL1.trig
index df544ef8..df544ef8 100644
--- a/test/TriGTests/LITERAL1.trig
+++ b/test/w3c/TriGTests/LITERAL1.trig
diff --git a/test/TriGTests/LITERAL1_all_controls.nq b/test/w3c/TriGTests/LITERAL1_all_controls.nq
index 3bfb3bd4..3bfb3bd4 100644
--- a/test/TriGTests/LITERAL1_all_controls.nq
+++ b/test/w3c/TriGTests/LITERAL1_all_controls.nq
diff --git a/test/TriGTests/LITERAL1_all_controls.trig b/test/w3c/TriGTests/LITERAL1_all_controls.trig
index 1246b619..1246b619 100644
--- a/test/TriGTests/LITERAL1_all_controls.trig
+++ b/test/w3c/TriGTests/LITERAL1_all_controls.trig
diff --git a/test/TriGTests/LITERAL1_all_punctuation.nq b/test/w3c/TriGTests/LITERAL1_all_punctuation.nq
index 47ef8763..47ef8763 100644
--- a/test/TriGTests/LITERAL1_all_punctuation.nq
+++ b/test/w3c/TriGTests/LITERAL1_all_punctuation.nq
diff --git a/test/TriGTests/LITERAL1_all_punctuation.trig b/test/w3c/TriGTests/LITERAL1_all_punctuation.trig
index 456e7972..456e7972 100644
--- a/test/TriGTests/LITERAL1_all_punctuation.trig
+++ b/test/w3c/TriGTests/LITERAL1_all_punctuation.trig
diff --git a/test/TriGTests/LITERAL1_ascii_boundaries.nq b/test/w3c/TriGTests/LITERAL1_ascii_boundaries.nq
index 672da9d1..672da9d1 100644
--- a/test/TriGTests/LITERAL1_ascii_boundaries.nq
+++ b/test/w3c/TriGTests/LITERAL1_ascii_boundaries.nq
diff --git a/test/TriGTests/LITERAL1_ascii_boundaries.trig b/test/w3c/TriGTests/LITERAL1_ascii_boundaries.trig
index cd14a4e8..cd14a4e8 100644
--- a/test/TriGTests/LITERAL1_ascii_boundaries.trig
+++ b/test/w3c/TriGTests/LITERAL1_ascii_boundaries.trig
diff --git a/test/TriGTests/LITERAL1_with_UTF8_boundaries.trig b/test/w3c/TriGTests/LITERAL1_with_UTF8_boundaries.trig
index b72eb040..b72eb040 100644
--- a/test/TriGTests/LITERAL1_with_UTF8_boundaries.trig
+++ b/test/w3c/TriGTests/LITERAL1_with_UTF8_boundaries.trig
diff --git a/test/TriGTests/LITERAL2.trig b/test/w3c/TriGTests/LITERAL2.trig
index c2b09ff6..c2b09ff6 100644
--- a/test/TriGTests/LITERAL2.trig
+++ b/test/w3c/TriGTests/LITERAL2.trig
diff --git a/test/TriGTests/LITERAL2_ascii_boundaries.nq b/test/w3c/TriGTests/LITERAL2_ascii_boundaries.nq
index 63402430..63402430 100644
--- a/test/TriGTests/LITERAL2_ascii_boundaries.nq
+++ b/test/w3c/TriGTests/LITERAL2_ascii_boundaries.nq
diff --git a/test/TriGTests/LITERAL2_ascii_boundaries.trig b/test/w3c/TriGTests/LITERAL2_ascii_boundaries.trig
index dd6b3ddf..dd6b3ddf 100644
--- a/test/TriGTests/LITERAL2_ascii_boundaries.trig
+++ b/test/w3c/TriGTests/LITERAL2_ascii_boundaries.trig
diff --git a/test/TriGTests/LITERAL2_with_UTF8_boundaries.trig b/test/w3c/TriGTests/LITERAL2_with_UTF8_boundaries.trig
index 0e1616db..0e1616db 100644
--- a/test/TriGTests/LITERAL2_with_UTF8_boundaries.trig
+++ b/test/w3c/TriGTests/LITERAL2_with_UTF8_boundaries.trig
diff --git a/test/TriGTests/LITERAL_LONG1.trig b/test/w3c/TriGTests/LITERAL_LONG1.trig
index 5db4af44..5db4af44 100644
--- a/test/TriGTests/LITERAL_LONG1.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG1.trig
diff --git a/test/TriGTests/LITERAL_LONG1_ascii_boundaries.nq b/test/w3c/TriGTests/LITERAL_LONG1_ascii_boundaries.nq
index 5dc9b17a..5dc9b17a 100644
--- a/test/TriGTests/LITERAL_LONG1_ascii_boundaries.nq
+++ b/test/w3c/TriGTests/LITERAL_LONG1_ascii_boundaries.nq
diff --git a/test/TriGTests/LITERAL_LONG1_ascii_boundaries.trig b/test/w3c/TriGTests/LITERAL_LONG1_ascii_boundaries.trig
index 25db84dd..25db84dd 100644
--- a/test/TriGTests/LITERAL_LONG1_ascii_boundaries.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG1_ascii_boundaries.trig
diff --git a/test/TriGTests/LITERAL_LONG1_with_1_squote.nq b/test/w3c/TriGTests/LITERAL_LONG1_with_1_squote.nq
index f72af857..f72af857 100644
--- a/test/TriGTests/LITERAL_LONG1_with_1_squote.nq
+++ b/test/w3c/TriGTests/LITERAL_LONG1_with_1_squote.nq
diff --git a/test/TriGTests/LITERAL_LONG1_with_1_squote.trig b/test/w3c/TriGTests/LITERAL_LONG1_with_1_squote.trig
index 45e742ed..45e742ed 100644
--- a/test/TriGTests/LITERAL_LONG1_with_1_squote.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG1_with_1_squote.trig
diff --git a/test/TriGTests/LITERAL_LONG1_with_2_squotes.nq b/test/w3c/TriGTests/LITERAL_LONG1_with_2_squotes.nq
index 5e7a4890..5e7a4890 100644
--- a/test/TriGTests/LITERAL_LONG1_with_2_squotes.nq
+++ b/test/w3c/TriGTests/LITERAL_LONG1_with_2_squotes.nq
diff --git a/test/TriGTests/LITERAL_LONG1_with_2_squotes.trig b/test/w3c/TriGTests/LITERAL_LONG1_with_2_squotes.trig
index 75f94883..75f94883 100644
--- a/test/TriGTests/LITERAL_LONG1_with_2_squotes.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG1_with_2_squotes.trig
diff --git a/test/TriGTests/LITERAL_LONG1_with_UTF8_boundaries.trig b/test/w3c/TriGTests/LITERAL_LONG1_with_UTF8_boundaries.trig
index e04b675e..e04b675e 100644
--- a/test/TriGTests/LITERAL_LONG1_with_UTF8_boundaries.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG1_with_UTF8_boundaries.trig
diff --git a/test/TriGTests/LITERAL_LONG2.trig b/test/w3c/TriGTests/LITERAL_LONG2.trig
index 2f1a86ec..2f1a86ec 100644
--- a/test/TriGTests/LITERAL_LONG2.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG2.trig
diff --git a/test/TriGTests/LITERAL_LONG2_ascii_boundaries.nq b/test/w3c/TriGTests/LITERAL_LONG2_ascii_boundaries.nq
index 1dc45f7c..1dc45f7c 100644
--- a/test/TriGTests/LITERAL_LONG2_ascii_boundaries.nq
+++ b/test/w3c/TriGTests/LITERAL_LONG2_ascii_boundaries.nq
diff --git a/test/TriGTests/LITERAL_LONG2_ascii_boundaries.trig b/test/w3c/TriGTests/LITERAL_LONG2_ascii_boundaries.trig
index 804fe250..804fe250 100644
--- a/test/TriGTests/LITERAL_LONG2_ascii_boundaries.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG2_ascii_boundaries.trig
diff --git a/test/TriGTests/LITERAL_LONG2_with_1_squote.nq b/test/w3c/TriGTests/LITERAL_LONG2_with_1_squote.nq
index 3cbb9785..3cbb9785 100644
--- a/test/TriGTests/LITERAL_LONG2_with_1_squote.nq
+++ b/test/w3c/TriGTests/LITERAL_LONG2_with_1_squote.nq
diff --git a/test/TriGTests/LITERAL_LONG2_with_1_squote.trig b/test/w3c/TriGTests/LITERAL_LONG2_with_1_squote.trig
index fccbe173..fccbe173 100644
--- a/test/TriGTests/LITERAL_LONG2_with_1_squote.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG2_with_1_squote.trig
diff --git a/test/TriGTests/LITERAL_LONG2_with_2_squotes.nq b/test/w3c/TriGTests/LITERAL_LONG2_with_2_squotes.nq
index cdab9945..cdab9945 100644
--- a/test/TriGTests/LITERAL_LONG2_with_2_squotes.nq
+++ b/test/w3c/TriGTests/LITERAL_LONG2_with_2_squotes.nq
diff --git a/test/TriGTests/LITERAL_LONG2_with_2_squotes.trig b/test/w3c/TriGTests/LITERAL_LONG2_with_2_squotes.trig
index 8d1f3359..8d1f3359 100644
--- a/test/TriGTests/LITERAL_LONG2_with_2_squotes.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG2_with_2_squotes.trig
diff --git a/test/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq b/test/w3c/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq
index 43b76993..43b76993 100644
--- a/test/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq
+++ b/test/w3c/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nq
diff --git a/test/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig b/test/w3c/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig
index 4dfe5e1f..4dfe5e1f 100644
--- a/test/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.trig
diff --git a/test/TriGTests/LITERAL_LONG2_with_UTF8_boundaries.trig b/test/w3c/TriGTests/LITERAL_LONG2_with_UTF8_boundaries.trig
index 644b32d8..644b32d8 100644
--- a/test/TriGTests/LITERAL_LONG2_with_UTF8_boundaries.trig
+++ b/test/w3c/TriGTests/LITERAL_LONG2_with_UTF8_boundaries.trig
diff --git a/test/TriGTests/LITERAL_with_UTF8_boundaries.nq b/test/w3c/TriGTests/LITERAL_with_UTF8_boundaries.nq
index 47a2527a..47a2527a 100644
--- a/test/TriGTests/LITERAL_with_UTF8_boundaries.nq
+++ b/test/w3c/TriGTests/LITERAL_with_UTF8_boundaries.nq
diff --git a/test/TriGTests/README b/test/w3c/TriGTests/README
index adbb2a3f..adbb2a3f 100644
--- a/test/TriGTests/README
+++ b/test/w3c/TriGTests/README
diff --git a/test/TriGTests/SPARQL_style_base.trig b/test/w3c/TriGTests/SPARQL_style_base.trig
index 5697b450..5697b450 100644
--- a/test/TriGTests/SPARQL_style_base.trig
+++ b/test/w3c/TriGTests/SPARQL_style_base.trig
diff --git a/test/TriGTests/SPARQL_style_prefix.trig b/test/w3c/TriGTests/SPARQL_style_prefix.trig
index 49bc9737..49bc9737 100644
--- a/test/TriGTests/SPARQL_style_prefix.trig
+++ b/test/w3c/TriGTests/SPARQL_style_prefix.trig
diff --git a/test/TriGTests/alternating_bnode_graphs.nq b/test/w3c/TriGTests/alternating_bnode_graphs.nq
index 66124112..66124112 100644
--- a/test/TriGTests/alternating_bnode_graphs.nq
+++ b/test/w3c/TriGTests/alternating_bnode_graphs.nq
diff --git a/test/TriGTests/alternating_bnode_graphs.trig b/test/w3c/TriGTests/alternating_bnode_graphs.trig
index e921099b..e921099b 100644
--- a/test/TriGTests/alternating_bnode_graphs.trig
+++ b/test/w3c/TriGTests/alternating_bnode_graphs.trig
diff --git a/test/TriGTests/alternating_iri_graphs.nq b/test/w3c/TriGTests/alternating_iri_graphs.nq
index 29c063e4..29c063e4 100644
--- a/test/TriGTests/alternating_iri_graphs.nq
+++ b/test/w3c/TriGTests/alternating_iri_graphs.nq
diff --git a/test/TriGTests/alternating_iri_graphs.trig b/test/w3c/TriGTests/alternating_iri_graphs.trig
index 6ce4d656..6ce4d656 100644
--- a/test/TriGTests/alternating_iri_graphs.trig
+++ b/test/w3c/TriGTests/alternating_iri_graphs.trig
diff --git a/test/TriGTests/anonymous_blank_node_graph.nq b/test/w3c/TriGTests/anonymous_blank_node_graph.nq
index 0522cbda..0522cbda 100644
--- a/test/TriGTests/anonymous_blank_node_graph.nq
+++ b/test/w3c/TriGTests/anonymous_blank_node_graph.nq
diff --git a/test/TriGTests/anonymous_blank_node_graph.trig b/test/w3c/TriGTests/anonymous_blank_node_graph.trig
index 6dd8d54e..6dd8d54e 100644
--- a/test/TriGTests/anonymous_blank_node_graph.trig
+++ b/test/w3c/TriGTests/anonymous_blank_node_graph.trig
diff --git a/test/TriGTests/anonymous_blank_node_object.nq b/test/w3c/TriGTests/anonymous_blank_node_object.nq
index a2c997f2..a2c997f2 100644
--- a/test/TriGTests/anonymous_blank_node_object.nq
+++ b/test/w3c/TriGTests/anonymous_blank_node_object.nq
diff --git a/test/TriGTests/anonymous_blank_node_object.trig b/test/w3c/TriGTests/anonymous_blank_node_object.trig
index e91e7102..e91e7102 100644
--- a/test/TriGTests/anonymous_blank_node_object.trig
+++ b/test/w3c/TriGTests/anonymous_blank_node_object.trig
diff --git a/test/TriGTests/anonymous_blank_node_subject.nq b/test/w3c/TriGTests/anonymous_blank_node_subject.nq
index b17e189c..b17e189c 100644
--- a/test/TriGTests/anonymous_blank_node_subject.nq
+++ b/test/w3c/TriGTests/anonymous_blank_node_subject.nq
diff --git a/test/TriGTests/anonymous_blank_node_subject.trig b/test/w3c/TriGTests/anonymous_blank_node_subject.trig
index e9866f94..e9866f94 100644
--- a/test/TriGTests/anonymous_blank_node_subject.trig
+++ b/test/w3c/TriGTests/anonymous_blank_node_subject.trig
diff --git a/test/TriGTests/bareword_a_predicate.nq b/test/w3c/TriGTests/bareword_a_predicate.nq
index fd01c46a..fd01c46a 100644
--- a/test/TriGTests/bareword_a_predicate.nq
+++ b/test/w3c/TriGTests/bareword_a_predicate.nq
diff --git a/test/TriGTests/bareword_a_predicate.trig b/test/w3c/TriGTests/bareword_a_predicate.trig
index 315dc9bb..315dc9bb 100644
--- a/test/TriGTests/bareword_a_predicate.trig
+++ b/test/w3c/TriGTests/bareword_a_predicate.trig
diff --git a/test/TriGTests/bareword_decimal.nq b/test/w3c/TriGTests/bareword_decimal.nq
index ed5de576..ed5de576 100644
--- a/test/TriGTests/bareword_decimal.nq
+++ b/test/w3c/TriGTests/bareword_decimal.nq
diff --git a/test/TriGTests/bareword_decimal.trig b/test/w3c/TriGTests/bareword_decimal.trig
index f862e712..f862e712 100644
--- a/test/TriGTests/bareword_decimal.trig
+++ b/test/w3c/TriGTests/bareword_decimal.trig
diff --git a/test/TriGTests/bareword_double.nq b/test/w3c/TriGTests/bareword_double.nq
index f1783256..f1783256 100644
--- a/test/TriGTests/bareword_double.nq
+++ b/test/w3c/TriGTests/bareword_double.nq
diff --git a/test/TriGTests/bareword_double.trig b/test/w3c/TriGTests/bareword_double.trig
index 788b8cee..788b8cee 100644
--- a/test/TriGTests/bareword_double.trig
+++ b/test/w3c/TriGTests/bareword_double.trig
diff --git a/test/TriGTests/bareword_integer.trig b/test/w3c/TriGTests/bareword_integer.trig
index be1fa8ed..be1fa8ed 100644
--- a/test/TriGTests/bareword_integer.trig
+++ b/test/w3c/TriGTests/bareword_integer.trig
diff --git a/test/TriGTests/blankNodePropertyList_as_object.nq b/test/w3c/TriGTests/blankNodePropertyList_as_object.nq
index 8e38d4e4..8e38d4e4 100644
--- a/test/TriGTests/blankNodePropertyList_as_object.nq
+++ b/test/w3c/TriGTests/blankNodePropertyList_as_object.nq
diff --git a/test/TriGTests/blankNodePropertyList_as_object.trig b/test/w3c/TriGTests/blankNodePropertyList_as_object.trig
index 724d77ba..724d77ba 100644
--- a/test/TriGTests/blankNodePropertyList_as_object.trig
+++ b/test/w3c/TriGTests/blankNodePropertyList_as_object.trig
diff --git a/test/TriGTests/blankNodePropertyList_as_subject.nq b/test/w3c/TriGTests/blankNodePropertyList_as_subject.nq
index b3c274ce..b3c274ce 100644
--- a/test/TriGTests/blankNodePropertyList_as_subject.nq
+++ b/test/w3c/TriGTests/blankNodePropertyList_as_subject.nq
diff --git a/test/TriGTests/blankNodePropertyList_as_subject.trig b/test/w3c/TriGTests/blankNodePropertyList_as_subject.trig
index 925b680a..925b680a 100644
--- a/test/TriGTests/blankNodePropertyList_as_subject.trig
+++ b/test/w3c/TriGTests/blankNodePropertyList_as_subject.trig
diff --git a/test/TriGTests/blankNodePropertyList_containing_collection.nq b/test/w3c/TriGTests/blankNodePropertyList_containing_collection.nq
index 85f272a7..85f272a7 100644
--- a/test/TriGTests/blankNodePropertyList_containing_collection.nq
+++ b/test/w3c/TriGTests/blankNodePropertyList_containing_collection.nq
diff --git a/test/TriGTests/blankNodePropertyList_containing_collection.trig b/test/w3c/TriGTests/blankNodePropertyList_containing_collection.trig
index d23b848c..d23b848c 100644
--- a/test/TriGTests/blankNodePropertyList_containing_collection.trig
+++ b/test/w3c/TriGTests/blankNodePropertyList_containing_collection.trig
diff --git a/test/TriGTests/blankNodePropertyList_with_multiple_triples.nq b/test/w3c/TriGTests/blankNodePropertyList_with_multiple_triples.nq
index ac7e6125..ac7e6125 100644
--- a/test/TriGTests/blankNodePropertyList_with_multiple_triples.nq
+++ b/test/w3c/TriGTests/blankNodePropertyList_with_multiple_triples.nq
diff --git a/test/TriGTests/blankNodePropertyList_with_multiple_triples.trig b/test/w3c/TriGTests/blankNodePropertyList_with_multiple_triples.trig
index dc5b5461..dc5b5461 100644
--- a/test/TriGTests/blankNodePropertyList_with_multiple_triples.trig
+++ b/test/w3c/TriGTests/blankNodePropertyList_with_multiple_triples.trig
diff --git a/test/TriGTests/collection_object.nq b/test/w3c/TriGTests/collection_object.nq
index 8ced4ad1..8ced4ad1 100644
--- a/test/TriGTests/collection_object.nq
+++ b/test/w3c/TriGTests/collection_object.nq
diff --git a/test/TriGTests/collection_object.trig b/test/w3c/TriGTests/collection_object.trig
index a86dd42f..a86dd42f 100644
--- a/test/TriGTests/collection_object.trig
+++ b/test/w3c/TriGTests/collection_object.trig
diff --git a/test/TriGTests/collection_subject.nq b/test/w3c/TriGTests/collection_subject.nq
index 26858dc1..26858dc1 100644
--- a/test/TriGTests/collection_subject.nq
+++ b/test/w3c/TriGTests/collection_subject.nq
diff --git a/test/TriGTests/collection_subject.trig b/test/w3c/TriGTests/collection_subject.trig
index cb49acd8..cb49acd8 100644
--- a/test/TriGTests/collection_subject.trig
+++ b/test/w3c/TriGTests/collection_subject.trig
diff --git a/test/TriGTests/comment_following_PNAME_NS.nq b/test/w3c/TriGTests/comment_following_PNAME_NS.nq
index a8ca81c5..a8ca81c5 100644
--- a/test/TriGTests/comment_following_PNAME_NS.nq
+++ b/test/w3c/TriGTests/comment_following_PNAME_NS.nq
diff --git a/test/TriGTests/comment_following_PNAME_NS.trig b/test/w3c/TriGTests/comment_following_PNAME_NS.trig
index c03124c4..c03124c4 100644
--- a/test/TriGTests/comment_following_PNAME_NS.trig
+++ b/test/w3c/TriGTests/comment_following_PNAME_NS.trig
diff --git a/test/TriGTests/comment_following_localName.trig b/test/w3c/TriGTests/comment_following_localName.trig
index 649a9a59..649a9a59 100644
--- a/test/TriGTests/comment_following_localName.trig
+++ b/test/w3c/TriGTests/comment_following_localName.trig
diff --git a/test/TriGTests/default_namespace_IRI.trig b/test/w3c/TriGTests/default_namespace_IRI.trig
index 7eccc879..7eccc879 100644
--- a/test/TriGTests/default_namespace_IRI.trig
+++ b/test/w3c/TriGTests/default_namespace_IRI.trig
diff --git a/test/TriGTests/double_lower_case_e.nq b/test/w3c/TriGTests/double_lower_case_e.nq
index c19ca11d..c19ca11d 100644
--- a/test/TriGTests/double_lower_case_e.nq
+++ b/test/w3c/TriGTests/double_lower_case_e.nq
diff --git a/test/TriGTests/double_lower_case_e.trig b/test/w3c/TriGTests/double_lower_case_e.trig
index 588669fa..588669fa 100644
--- a/test/TriGTests/double_lower_case_e.trig
+++ b/test/w3c/TriGTests/double_lower_case_e.trig
diff --git a/test/TriGTests/empty_collection.nq b/test/w3c/TriGTests/empty_collection.nq
index f85ed8fb..f85ed8fb 100644
--- a/test/TriGTests/empty_collection.nq
+++ b/test/w3c/TriGTests/empty_collection.nq
diff --git a/test/TriGTests/empty_collection.trig b/test/w3c/TriGTests/empty_collection.trig
index c6aef8b2..c6aef8b2 100644
--- a/test/TriGTests/empty_collection.trig
+++ b/test/w3c/TriGTests/empty_collection.trig
diff --git a/test/TriGTests/first.nq b/test/w3c/TriGTests/first.nq
index 0ba78d55..0ba78d55 100644
--- a/test/TriGTests/first.nq
+++ b/test/w3c/TriGTests/first.nq
diff --git a/test/TriGTests/first.trig b/test/w3c/TriGTests/first.trig
index 0f80aa69..0f80aa69 100644
--- a/test/TriGTests/first.trig
+++ b/test/w3c/TriGTests/first.trig
diff --git a/test/TriGTests/labeled_blank_node_graph.nq b/test/w3c/TriGTests/labeled_blank_node_graph.nq
index e9d83f4e..e9d83f4e 100644
--- a/test/TriGTests/labeled_blank_node_graph.nq
+++ b/test/w3c/TriGTests/labeled_blank_node_graph.nq
diff --git a/test/TriGTests/labeled_blank_node_graph.trig b/test/w3c/TriGTests/labeled_blank_node_graph.trig
index a6adbb98..a6adbb98 100644
--- a/test/TriGTests/labeled_blank_node_graph.trig
+++ b/test/w3c/TriGTests/labeled_blank_node_graph.trig
diff --git a/test/TriGTests/labeled_blank_node_object.nq b/test/w3c/TriGTests/labeled_blank_node_object.nq
index 58b5fad2..58b5fad2 100644
--- a/test/TriGTests/labeled_blank_node_object.nq
+++ b/test/w3c/TriGTests/labeled_blank_node_object.nq
diff --git a/test/TriGTests/labeled_blank_node_object.trig b/test/w3c/TriGTests/labeled_blank_node_object.trig
index 1ac7de76..1ac7de76 100644
--- a/test/TriGTests/labeled_blank_node_object.trig
+++ b/test/w3c/TriGTests/labeled_blank_node_object.trig
diff --git a/test/TriGTests/labeled_blank_node_subject.nq b/test/w3c/TriGTests/labeled_blank_node_subject.nq
index b1f38d51..b1f38d51 100644
--- a/test/TriGTests/labeled_blank_node_subject.nq
+++ b/test/w3c/TriGTests/labeled_blank_node_subject.nq
diff --git a/test/TriGTests/labeled_blank_node_subject.trig b/test/w3c/TriGTests/labeled_blank_node_subject.trig
index 4dca0e98..4dca0e98 100644
--- a/test/TriGTests/labeled_blank_node_subject.trig
+++ b/test/w3c/TriGTests/labeled_blank_node_subject.trig
diff --git a/test/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nq b/test/w3c/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nq
index 969c0c2a..969c0c2a 100644
--- a/test/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/w3c/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nq
diff --git a/test/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig b/test/w3c/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig
index 8920d476..8920d476 100644
--- a/test/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/w3c/TriGTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.trig
diff --git a/test/TriGTests/labeled_blank_node_with_leading_digit.nq b/test/w3c/TriGTests/labeled_blank_node_with_leading_digit.nq
index 24f52035..24f52035 100644
--- a/test/TriGTests/labeled_blank_node_with_leading_digit.nq
+++ b/test/w3c/TriGTests/labeled_blank_node_with_leading_digit.nq
diff --git a/test/TriGTests/labeled_blank_node_with_leading_digit.trig b/test/w3c/TriGTests/labeled_blank_node_with_leading_digit.trig
index 32ff3860..32ff3860 100644
--- a/test/TriGTests/labeled_blank_node_with_leading_digit.trig
+++ b/test/w3c/TriGTests/labeled_blank_node_with_leading_digit.trig
diff --git a/test/TriGTests/labeled_blank_node_with_leading_underscore.nq b/test/w3c/TriGTests/labeled_blank_node_with_leading_underscore.nq
index 57d0044e..57d0044e 100644
--- a/test/TriGTests/labeled_blank_node_with_leading_underscore.nq
+++ b/test/w3c/TriGTests/labeled_blank_node_with_leading_underscore.nq
diff --git a/test/TriGTests/labeled_blank_node_with_leading_underscore.trig b/test/w3c/TriGTests/labeled_blank_node_with_leading_underscore.trig
index 11bd621c..11bd621c 100644
--- a/test/TriGTests/labeled_blank_node_with_leading_underscore.trig
+++ b/test/w3c/TriGTests/labeled_blank_node_with_leading_underscore.trig
diff --git a/test/TriGTests/labeled_blank_node_with_non_leading_extras.nq b/test/w3c/TriGTests/labeled_blank_node_with_non_leading_extras.nq
index ebf8024c..ebf8024c 100644
--- a/test/TriGTests/labeled_blank_node_with_non_leading_extras.nq
+++ b/test/w3c/TriGTests/labeled_blank_node_with_non_leading_extras.nq
diff --git a/test/TriGTests/labeled_blank_node_with_non_leading_extras.trig b/test/w3c/TriGTests/labeled_blank_node_with_non_leading_extras.trig
index dad502a4..dad502a4 100644
--- a/test/TriGTests/labeled_blank_node_with_non_leading_extras.trig
+++ b/test/w3c/TriGTests/labeled_blank_node_with_non_leading_extras.trig
diff --git a/test/TriGTests/langtagged_LONG.trig b/test/w3c/TriGTests/langtagged_LONG.trig
index d63e0e19..d63e0e19 100644
--- a/test/TriGTests/langtagged_LONG.trig
+++ b/test/w3c/TriGTests/langtagged_LONG.trig
diff --git a/test/TriGTests/langtagged_LONG_with_subtag.nq b/test/w3c/TriGTests/langtagged_LONG_with_subtag.nq
index 14b56574..14b56574 100644
--- a/test/TriGTests/langtagged_LONG_with_subtag.nq
+++ b/test/w3c/TriGTests/langtagged_LONG_with_subtag.nq
diff --git a/test/TriGTests/langtagged_LONG_with_subtag.trig b/test/w3c/TriGTests/langtagged_LONG_with_subtag.trig
index c7ba8f2d..c7ba8f2d 100644
--- a/test/TriGTests/langtagged_LONG_with_subtag.trig
+++ b/test/w3c/TriGTests/langtagged_LONG_with_subtag.trig
diff --git a/test/TriGTests/langtagged_non_LONG.nq b/test/w3c/TriGTests/langtagged_non_LONG.nq
index 7e0a5b9e..7e0a5b9e 100644
--- a/test/TriGTests/langtagged_non_LONG.nq
+++ b/test/w3c/TriGTests/langtagged_non_LONG.nq
diff --git a/test/TriGTests/langtagged_non_LONG.trig b/test/w3c/TriGTests/langtagged_non_LONG.trig
index bebcb884..bebcb884 100644
--- a/test/TriGTests/langtagged_non_LONG.trig
+++ b/test/w3c/TriGTests/langtagged_non_LONG.trig
diff --git a/test/TriGTests/lantag_with_subtag.nq b/test/w3c/TriGTests/lantag_with_subtag.nq
index 165aa77c..165aa77c 100644
--- a/test/TriGTests/lantag_with_subtag.nq
+++ b/test/w3c/TriGTests/lantag_with_subtag.nq
diff --git a/test/TriGTests/lantag_with_subtag.trig b/test/w3c/TriGTests/lantag_with_subtag.trig
index d25f1039..d25f1039 100644
--- a/test/TriGTests/lantag_with_subtag.trig
+++ b/test/w3c/TriGTests/lantag_with_subtag.trig
diff --git a/test/TriGTests/last.nq b/test/w3c/TriGTests/last.nq
index 54b3d790..54b3d790 100644
--- a/test/TriGTests/last.nq
+++ b/test/w3c/TriGTests/last.nq
diff --git a/test/TriGTests/last.trig b/test/w3c/TriGTests/last.trig
index 6fd17f7f..6fd17f7f 100644
--- a/test/TriGTests/last.trig
+++ b/test/w3c/TriGTests/last.trig
diff --git a/test/TriGTests/literal_false.nq b/test/w3c/TriGTests/literal_false.nq
index 9a334557..9a334557 100644
--- a/test/TriGTests/literal_false.nq
+++ b/test/w3c/TriGTests/literal_false.nq
diff --git a/test/TriGTests/literal_false.trig b/test/w3c/TriGTests/literal_false.trig
index e1f6f447..e1f6f447 100644
--- a/test/TriGTests/literal_false.trig
+++ b/test/w3c/TriGTests/literal_false.trig
diff --git a/test/TriGTests/literal_true.nq b/test/w3c/TriGTests/literal_true.nq
index 39675c3b..39675c3b 100644
--- a/test/TriGTests/literal_true.nq
+++ b/test/w3c/TriGTests/literal_true.nq
diff --git a/test/TriGTests/literal_true.trig b/test/w3c/TriGTests/literal_true.trig
index b49aa1ac..b49aa1ac 100644
--- a/test/TriGTests/literal_true.trig
+++ b/test/w3c/TriGTests/literal_true.trig
diff --git a/test/TriGTests/literal_with_BACKSPACE.nq b/test/w3c/TriGTests/literal_with_BACKSPACE.nq
index e4e9a247..e4e9a247 100644
--- a/test/TriGTests/literal_with_BACKSPACE.nq
+++ b/test/w3c/TriGTests/literal_with_BACKSPACE.nq
diff --git a/test/TriGTests/literal_with_BACKSPACE.trig b/test/w3c/TriGTests/literal_with_BACKSPACE.trig
index 0a3a1cac..0a3a1cac 100644
--- a/test/TriGTests/literal_with_BACKSPACE.trig
+++ b/test/w3c/TriGTests/literal_with_BACKSPACE.trig
diff --git a/test/TriGTests/literal_with_CARRIAGE_RETURN.nq b/test/w3c/TriGTests/literal_with_CARRIAGE_RETURN.nq
index d1ecddce..d1ecddce 100644
--- a/test/TriGTests/literal_with_CARRIAGE_RETURN.nq
+++ b/test/w3c/TriGTests/literal_with_CARRIAGE_RETURN.nq
diff --git a/test/TriGTests/literal_with_CARRIAGE_RETURN.trig b/test/w3c/TriGTests/literal_with_CARRIAGE_RETURN.trig
index 18d6fe84..18d6fe84 100644
--- a/test/TriGTests/literal_with_CARRIAGE_RETURN.trig
+++ b/test/w3c/TriGTests/literal_with_CARRIAGE_RETURN.trig
diff --git a/test/TriGTests/literal_with_CHARACTER_TABULATION.nq b/test/w3c/TriGTests/literal_with_CHARACTER_TABULATION.nq
index 4baf1754..4baf1754 100644
--- a/test/TriGTests/literal_with_CHARACTER_TABULATION.nq
+++ b/test/w3c/TriGTests/literal_with_CHARACTER_TABULATION.nq
diff --git a/test/TriGTests/literal_with_CHARACTER_TABULATION.trig b/test/w3c/TriGTests/literal_with_CHARACTER_TABULATION.trig
index 65b4152a..65b4152a 100644
--- a/test/TriGTests/literal_with_CHARACTER_TABULATION.trig
+++ b/test/w3c/TriGTests/literal_with_CHARACTER_TABULATION.trig
diff --git a/test/TriGTests/literal_with_FORM_FEED.nq b/test/w3c/TriGTests/literal_with_FORM_FEED.nq
index c6157bf3..c6157bf3 100644
--- a/test/TriGTests/literal_with_FORM_FEED.nq
+++ b/test/w3c/TriGTests/literal_with_FORM_FEED.nq
diff --git a/test/TriGTests/literal_with_FORM_FEED.trig b/test/w3c/TriGTests/literal_with_FORM_FEED.trig
index 742f7cac..742f7cac 100644
--- a/test/TriGTests/literal_with_FORM_FEED.trig
+++ b/test/w3c/TriGTests/literal_with_FORM_FEED.trig
diff --git a/test/TriGTests/literal_with_LINE_FEED.nq b/test/w3c/TriGTests/literal_with_LINE_FEED.nq
index facb59ec..facb59ec 100644
--- a/test/TriGTests/literal_with_LINE_FEED.nq
+++ b/test/w3c/TriGTests/literal_with_LINE_FEED.nq
diff --git a/test/TriGTests/literal_with_LINE_FEED.trig b/test/w3c/TriGTests/literal_with_LINE_FEED.trig
index 26c292d9..26c292d9 100644
--- a/test/TriGTests/literal_with_LINE_FEED.trig
+++ b/test/w3c/TriGTests/literal_with_LINE_FEED.trig
diff --git a/test/TriGTests/literal_with_REVERSE_SOLIDUS.nq b/test/w3c/TriGTests/literal_with_REVERSE_SOLIDUS.nq
index 45674069..45674069 100644
--- a/test/TriGTests/literal_with_REVERSE_SOLIDUS.nq
+++ b/test/w3c/TriGTests/literal_with_REVERSE_SOLIDUS.nq
diff --git a/test/TriGTests/literal_with_REVERSE_SOLIDUS.trig b/test/w3c/TriGTests/literal_with_REVERSE_SOLIDUS.trig
index b939dc28..b939dc28 100644
--- a/test/TriGTests/literal_with_REVERSE_SOLIDUS.trig
+++ b/test/w3c/TriGTests/literal_with_REVERSE_SOLIDUS.trig
diff --git a/test/TriGTests/literal_with_escaped_BACKSPACE.trig b/test/w3c/TriGTests/literal_with_escaped_BACKSPACE.trig
index f13d246b..f13d246b 100644
--- a/test/TriGTests/literal_with_escaped_BACKSPACE.trig
+++ b/test/w3c/TriGTests/literal_with_escaped_BACKSPACE.trig
diff --git a/test/TriGTests/literal_with_escaped_CARRIAGE_RETURN.trig b/test/w3c/TriGTests/literal_with_escaped_CARRIAGE_RETURN.trig
index c2ded66d..c2ded66d 100644
--- a/test/TriGTests/literal_with_escaped_CARRIAGE_RETURN.trig
+++ b/test/w3c/TriGTests/literal_with_escaped_CARRIAGE_RETURN.trig
diff --git a/test/TriGTests/literal_with_escaped_CHARACTER_TABULATION.trig b/test/w3c/TriGTests/literal_with_escaped_CHARACTER_TABULATION.trig
index 60dbac21..60dbac21 100644
--- a/test/TriGTests/literal_with_escaped_CHARACTER_TABULATION.trig
+++ b/test/w3c/TriGTests/literal_with_escaped_CHARACTER_TABULATION.trig
diff --git a/test/TriGTests/literal_with_escaped_FORM_FEED.trig b/test/w3c/TriGTests/literal_with_escaped_FORM_FEED.trig
index 63f8dc97..63f8dc97 100644
--- a/test/TriGTests/literal_with_escaped_FORM_FEED.trig
+++ b/test/w3c/TriGTests/literal_with_escaped_FORM_FEED.trig
diff --git a/test/TriGTests/literal_with_escaped_LINE_FEED.trig b/test/w3c/TriGTests/literal_with_escaped_LINE_FEED.trig
index 2c1f89a4..2c1f89a4 100644
--- a/test/TriGTests/literal_with_escaped_LINE_FEED.trig
+++ b/test/w3c/TriGTests/literal_with_escaped_LINE_FEED.trig
diff --git a/test/TriGTests/literal_with_numeric_escape4.nq b/test/w3c/TriGTests/literal_with_numeric_escape4.nq
index 84fce641..84fce641 100644
--- a/test/TriGTests/literal_with_numeric_escape4.nq
+++ b/test/w3c/TriGTests/literal_with_numeric_escape4.nq
diff --git a/test/TriGTests/literal_with_numeric_escape4.trig b/test/w3c/TriGTests/literal_with_numeric_escape4.trig
index 1c868cc9..1c868cc9 100644
--- a/test/TriGTests/literal_with_numeric_escape4.trig
+++ b/test/w3c/TriGTests/literal_with_numeric_escape4.trig
diff --git a/test/TriGTests/literal_with_numeric_escape8.trig b/test/w3c/TriGTests/literal_with_numeric_escape8.trig
index b36ff3ea..b36ff3ea 100644
--- a/test/TriGTests/literal_with_numeric_escape8.trig
+++ b/test/w3c/TriGTests/literal_with_numeric_escape8.trig
diff --git a/test/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.nq b/test/w3c/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.nq
index 1f93580c..1f93580c 100644
--- a/test/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/w3c/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.nq
diff --git a/test/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.trig b/test/w3c/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.trig
index 08221635..08221635 100644
--- a/test/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/w3c/TriGTests/localName_with_PN_CHARS_BASE_character_boundaries.trig
diff --git a/test/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq b/test/w3c/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq
index c347f934..c347f934 100644
--- a/test/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/w3c/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq
diff --git a/test/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig b/test/w3c/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig
index c3f36e9e..c3f36e9e 100644
--- a/test/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/w3c/TriGTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.trig
diff --git a/test/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq b/test/w3c/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq
index 988855ef..988855ef 100644
--- a/test/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/w3c/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq
diff --git a/test/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig b/test/w3c/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig
index dd48ac12..dd48ac12 100644
--- a/test/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/w3c/TriGTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.trig
diff --git a/test/TriGTests/localName_with_leading_digit.nq b/test/w3c/TriGTests/localName_with_leading_digit.nq
index 6f05d1ca..6f05d1ca 100644
--- a/test/TriGTests/localName_with_leading_digit.nq
+++ b/test/w3c/TriGTests/localName_with_leading_digit.nq
diff --git a/test/TriGTests/localName_with_leading_digit.trig b/test/w3c/TriGTests/localName_with_leading_digit.trig
index 540aa007..540aa007 100644
--- a/test/TriGTests/localName_with_leading_digit.trig
+++ b/test/w3c/TriGTests/localName_with_leading_digit.trig
diff --git a/test/TriGTests/localName_with_leading_underscore.nq b/test/w3c/TriGTests/localName_with_leading_underscore.nq
index 2cb72818..2cb72818 100644
--- a/test/TriGTests/localName_with_leading_underscore.nq
+++ b/test/w3c/TriGTests/localName_with_leading_underscore.nq
diff --git a/test/TriGTests/localName_with_leading_underscore.trig b/test/w3c/TriGTests/localName_with_leading_underscore.trig
index 72f2e30b..72f2e30b 100644
--- a/test/TriGTests/localName_with_leading_underscore.trig
+++ b/test/w3c/TriGTests/localName_with_leading_underscore.trig
diff --git a/test/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq b/test/w3c/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq
index 9c6a3d4d..9c6a3d4d 100644
--- a/test/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq
+++ b/test/w3c/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq
diff --git a/test/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig b/test/w3c/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig
index d998e3d4..d998e3d4 100644
--- a/test/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/w3c/TriGTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.trig
diff --git a/test/TriGTests/localName_with_non_leading_extras.nq b/test/w3c/TriGTests/localName_with_non_leading_extras.nq
index 40353439..40353439 100644
--- a/test/TriGTests/localName_with_non_leading_extras.nq
+++ b/test/w3c/TriGTests/localName_with_non_leading_extras.nq
diff --git a/test/TriGTests/localName_with_non_leading_extras.trig b/test/w3c/TriGTests/localName_with_non_leading_extras.trig
index bd1c32c8..bd1c32c8 100644
--- a/test/TriGTests/localName_with_non_leading_extras.trig
+++ b/test/w3c/TriGTests/localName_with_non_leading_extras.trig
diff --git a/test/TriGTests/localname_with_COLON.nq b/test/w3c/TriGTests/localname_with_COLON.nq
index 9a1a0d5a..9a1a0d5a 100644
--- a/test/TriGTests/localname_with_COLON.nq
+++ b/test/w3c/TriGTests/localname_with_COLON.nq
diff --git a/test/TriGTests/localname_with_COLON.trig b/test/w3c/TriGTests/localname_with_COLON.trig
index e166d575..e166d575 100644
--- a/test/TriGTests/localname_with_COLON.trig
+++ b/test/w3c/TriGTests/localname_with_COLON.trig
diff --git a/test/TriGTests/manifest.ttl b/test/w3c/TriGTests/manifest.ttl
index 10a4661f..10a4661f 100644
--- a/test/TriGTests/manifest.ttl
+++ b/test/w3c/TriGTests/manifest.ttl
diff --git a/test/TriGTests/negative_numeric.nq b/test/w3c/TriGTests/negative_numeric.nq
index 9c7f8126..9c7f8126 100644
--- a/test/TriGTests/negative_numeric.nq
+++ b/test/w3c/TriGTests/negative_numeric.nq
diff --git a/test/TriGTests/negative_numeric.trig b/test/w3c/TriGTests/negative_numeric.trig
index cbfe85f8..cbfe85f8 100644
--- a/test/TriGTests/negative_numeric.trig
+++ b/test/w3c/TriGTests/negative_numeric.trig
diff --git a/test/TriGTests/nested_blankNodePropertyLists.nq b/test/w3c/TriGTests/nested_blankNodePropertyLists.nq
index 541cd3b9..541cd3b9 100644
--- a/test/TriGTests/nested_blankNodePropertyLists.nq
+++ b/test/w3c/TriGTests/nested_blankNodePropertyLists.nq
diff --git a/test/TriGTests/nested_blankNodePropertyLists.trig b/test/w3c/TriGTests/nested_blankNodePropertyLists.trig
index 5b28195a..5b28195a 100644
--- a/test/TriGTests/nested_blankNodePropertyLists.trig
+++ b/test/w3c/TriGTests/nested_blankNodePropertyLists.trig
diff --git a/test/TriGTests/nested_collection.nq b/test/w3c/TriGTests/nested_collection.nq
index f504b3aa..f504b3aa 100644
--- a/test/TriGTests/nested_collection.nq
+++ b/test/w3c/TriGTests/nested_collection.nq
diff --git a/test/TriGTests/nested_collection.trig b/test/w3c/TriGTests/nested_collection.trig
index 5d4a3017..5d4a3017 100644
--- a/test/TriGTests/nested_collection.trig
+++ b/test/w3c/TriGTests/nested_collection.trig
diff --git a/test/TriGTests/number_sign_following_PNAME_NS.nq b/test/w3c/TriGTests/number_sign_following_PNAME_NS.nq
index 82d9629a..82d9629a 100644
--- a/test/TriGTests/number_sign_following_PNAME_NS.nq
+++ b/test/w3c/TriGTests/number_sign_following_PNAME_NS.nq
diff --git a/test/TriGTests/number_sign_following_PNAME_NS.trig b/test/w3c/TriGTests/number_sign_following_PNAME_NS.trig
index 2003fa4d..2003fa4d 100644
--- a/test/TriGTests/number_sign_following_PNAME_NS.trig
+++ b/test/w3c/TriGTests/number_sign_following_PNAME_NS.trig
diff --git a/test/TriGTests/number_sign_following_localName.nq b/test/w3c/TriGTests/number_sign_following_localName.nq
index 5ae57b8d..5ae57b8d 100644
--- a/test/TriGTests/number_sign_following_localName.nq
+++ b/test/w3c/TriGTests/number_sign_following_localName.nq
diff --git a/test/TriGTests/number_sign_following_localName.trig b/test/w3c/TriGTests/number_sign_following_localName.trig
index a0e39ecd..a0e39ecd 100644
--- a/test/TriGTests/number_sign_following_localName.trig
+++ b/test/w3c/TriGTests/number_sign_following_localName.trig
diff --git a/test/TriGTests/numeric_with_leading_0.nq b/test/w3c/TriGTests/numeric_with_leading_0.nq
index f028e790..f028e790 100644
--- a/test/TriGTests/numeric_with_leading_0.nq
+++ b/test/w3c/TriGTests/numeric_with_leading_0.nq
diff --git a/test/TriGTests/numeric_with_leading_0.trig b/test/w3c/TriGTests/numeric_with_leading_0.trig
index 6da8ad89..6da8ad89 100644
--- a/test/TriGTests/numeric_with_leading_0.trig
+++ b/test/w3c/TriGTests/numeric_with_leading_0.trig
diff --git a/test/TriGTests/objectList_with_two_objects.nq b/test/w3c/TriGTests/objectList_with_two_objects.nq
index 4b4e044b..4b4e044b 100644
--- a/test/TriGTests/objectList_with_two_objects.nq
+++ b/test/w3c/TriGTests/objectList_with_two_objects.nq
diff --git a/test/TriGTests/objectList_with_two_objects.trig b/test/w3c/TriGTests/objectList_with_two_objects.trig
index 6dbe9792..6dbe9792 100644
--- a/test/TriGTests/objectList_with_two_objects.trig
+++ b/test/w3c/TriGTests/objectList_with_two_objects.trig
diff --git a/test/TriGTests/old_style_base.trig b/test/w3c/TriGTests/old_style_base.trig
index d1f5d4a2..d1f5d4a2 100644
--- a/test/TriGTests/old_style_base.trig
+++ b/test/w3c/TriGTests/old_style_base.trig
diff --git a/test/TriGTests/old_style_prefix.trig b/test/w3c/TriGTests/old_style_prefix.trig
index 014c1f0d..014c1f0d 100644
--- a/test/TriGTests/old_style_prefix.trig
+++ b/test/w3c/TriGTests/old_style_prefix.trig
diff --git a/test/TriGTests/percent_escaped_localName.nq b/test/w3c/TriGTests/percent_escaped_localName.nq
index 85273e95..85273e95 100644
--- a/test/TriGTests/percent_escaped_localName.nq
+++ b/test/w3c/TriGTests/percent_escaped_localName.nq
diff --git a/test/TriGTests/percent_escaped_localName.trig b/test/w3c/TriGTests/percent_escaped_localName.trig
index a2b55c90..a2b55c90 100644
--- a/test/TriGTests/percent_escaped_localName.trig
+++ b/test/w3c/TriGTests/percent_escaped_localName.trig
diff --git a/test/TriGTests/positive_numeric.nq b/test/w3c/TriGTests/positive_numeric.nq
index 25337582..25337582 100644
--- a/test/TriGTests/positive_numeric.nq
+++ b/test/w3c/TriGTests/positive_numeric.nq
diff --git a/test/TriGTests/positive_numeric.trig b/test/w3c/TriGTests/positive_numeric.trig
index 5c7a166d..5c7a166d 100644
--- a/test/TriGTests/positive_numeric.trig
+++ b/test/w3c/TriGTests/positive_numeric.trig
diff --git a/test/TriGTests/predicateObjectList_with_two_objectLists.nq b/test/w3c/TriGTests/predicateObjectList_with_two_objectLists.nq
index 0c203403..0c203403 100644
--- a/test/TriGTests/predicateObjectList_with_two_objectLists.nq
+++ b/test/w3c/TriGTests/predicateObjectList_with_two_objectLists.nq
diff --git a/test/TriGTests/predicateObjectList_with_two_objectLists.trig b/test/w3c/TriGTests/predicateObjectList_with_two_objectLists.trig
index 0513be26..0513be26 100644
--- a/test/TriGTests/predicateObjectList_with_two_objectLists.trig
+++ b/test/w3c/TriGTests/predicateObjectList_with_two_objectLists.trig
diff --git a/test/TriGTests/prefix_only_IRI.trig b/test/w3c/TriGTests/prefix_only_IRI.trig
index c0f4d441..c0f4d441 100644
--- a/test/TriGTests/prefix_only_IRI.trig
+++ b/test/w3c/TriGTests/prefix_only_IRI.trig
diff --git a/test/TriGTests/prefix_reassigned_and_used.nq b/test/w3c/TriGTests/prefix_reassigned_and_used.nq
index 5e65c13f..5e65c13f 100644
--- a/test/TriGTests/prefix_reassigned_and_used.nq
+++ b/test/w3c/TriGTests/prefix_reassigned_and_used.nq
diff --git a/test/TriGTests/prefix_reassigned_and_used.trig b/test/w3c/TriGTests/prefix_reassigned_and_used.trig
index 6abd7ea9..6abd7ea9 100644
--- a/test/TriGTests/prefix_reassigned_and_used.trig
+++ b/test/w3c/TriGTests/prefix_reassigned_and_used.trig
diff --git a/test/TriGTests/prefix_with_PN_CHARS_BASE_character_boundaries.trig b/test/w3c/TriGTests/prefix_with_PN_CHARS_BASE_character_boundaries.trig
index 30b7b8ab..30b7b8ab 100644
--- a/test/TriGTests/prefix_with_PN_CHARS_BASE_character_boundaries.trig
+++ b/test/w3c/TriGTests/prefix_with_PN_CHARS_BASE_character_boundaries.trig
diff --git a/test/TriGTests/prefix_with_non_leading_extras.trig b/test/w3c/TriGTests/prefix_with_non_leading_extras.trig
index 64e86f37..64e86f37 100644
--- a/test/TriGTests/prefix_with_non_leading_extras.trig
+++ b/test/w3c/TriGTests/prefix_with_non_leading_extras.trig
diff --git a/test/TriGTests/prefixed_IRI_object.trig b/test/w3c/TriGTests/prefixed_IRI_object.trig
index 2c04b80b..2c04b80b 100644
--- a/test/TriGTests/prefixed_IRI_object.trig
+++ b/test/w3c/TriGTests/prefixed_IRI_object.trig
diff --git a/test/TriGTests/prefixed_IRI_predicate.trig b/test/w3c/TriGTests/prefixed_IRI_predicate.trig
index f41e7a35..f41e7a35 100644
--- a/test/TriGTests/prefixed_IRI_predicate.trig
+++ b/test/w3c/TriGTests/prefixed_IRI_predicate.trig
diff --git a/test/TriGTests/prefixed_name_datatype.trig b/test/w3c/TriGTests/prefixed_name_datatype.trig
index 45d53873..45d53873 100644
--- a/test/TriGTests/prefixed_name_datatype.trig
+++ b/test/w3c/TriGTests/prefixed_name_datatype.trig
diff --git a/test/TriGTests/repeated_semis_at_end.trig b/test/w3c/TriGTests/repeated_semis_at_end.trig
index e4131b94..e4131b94 100644
--- a/test/TriGTests/repeated_semis_at_end.trig
+++ b/test/w3c/TriGTests/repeated_semis_at_end.trig
diff --git a/test/TriGTests/repeated_semis_not_at_end.nq b/test/w3c/TriGTests/repeated_semis_not_at_end.nq
index 81f01397..81f01397 100644
--- a/test/TriGTests/repeated_semis_not_at_end.nq
+++ b/test/w3c/TriGTests/repeated_semis_not_at_end.nq
diff --git a/test/TriGTests/repeated_semis_not_at_end.trig b/test/w3c/TriGTests/repeated_semis_not_at_end.trig
index 270ac985..270ac985 100644
--- a/test/TriGTests/repeated_semis_not_at_end.trig
+++ b/test/w3c/TriGTests/repeated_semis_not_at_end.trig
diff --git a/test/TriGTests/reserved_escaped_localName.nq b/test/w3c/TriGTests/reserved_escaped_localName.nq
index d965ceb0..d965ceb0 100644
--- a/test/TriGTests/reserved_escaped_localName.nq
+++ b/test/w3c/TriGTests/reserved_escaped_localName.nq
diff --git a/test/TriGTests/reserved_escaped_localName.trig b/test/w3c/TriGTests/reserved_escaped_localName.trig
index 991594ad..991594ad 100644
--- a/test/TriGTests/reserved_escaped_localName.trig
+++ b/test/w3c/TriGTests/reserved_escaped_localName.trig
diff --git a/test/TriGTests/sole_blankNodePropertyList.nq b/test/w3c/TriGTests/sole_blankNodePropertyList.nq
index ae23b3de..ae23b3de 100644
--- a/test/TriGTests/sole_blankNodePropertyList.nq
+++ b/test/w3c/TriGTests/sole_blankNodePropertyList.nq
diff --git a/test/TriGTests/sole_blankNodePropertyList.trig b/test/w3c/TriGTests/sole_blankNodePropertyList.trig
index ae3765f5..ae3765f5 100644
--- a/test/TriGTests/sole_blankNodePropertyList.trig
+++ b/test/w3c/TriGTests/sole_blankNodePropertyList.trig
diff --git a/test/TriGTests/trig-bnodeplist-graph-bad-01.trig b/test/w3c/TriGTests/trig-bnodeplist-graph-bad-01.trig
index 2b9a8d36..2b9a8d36 100644
--- a/test/TriGTests/trig-bnodeplist-graph-bad-01.trig
+++ b/test/w3c/TriGTests/trig-bnodeplist-graph-bad-01.trig
diff --git a/test/TriGTests/trig-collection-graph-bad-01.trig b/test/w3c/TriGTests/trig-collection-graph-bad-01.trig
index e8a7eaeb..e8a7eaeb 100644
--- a/test/TriGTests/trig-collection-graph-bad-01.trig
+++ b/test/w3c/TriGTests/trig-collection-graph-bad-01.trig
diff --git a/test/TriGTests/trig-collection-graph-bad-02.trig b/test/w3c/TriGTests/trig-collection-graph-bad-02.trig
index ba90bcfd..ba90bcfd 100644
--- a/test/TriGTests/trig-collection-graph-bad-02.trig
+++ b/test/w3c/TriGTests/trig-collection-graph-bad-02.trig
diff --git a/test/TriGTests/trig-eval-bad-01.trig b/test/w3c/TriGTests/trig-eval-bad-01.trig
index 36f66252..36f66252 100644
--- a/test/TriGTests/trig-eval-bad-01.trig
+++ b/test/w3c/TriGTests/trig-eval-bad-01.trig
diff --git a/test/TriGTests/trig-eval-bad-02.trig b/test/w3c/TriGTests/trig-eval-bad-02.trig
index 2fc1aa3d..2fc1aa3d 100644
--- a/test/TriGTests/trig-eval-bad-02.trig
+++ b/test/w3c/TriGTests/trig-eval-bad-02.trig
diff --git a/test/TriGTests/trig-eval-bad-03.trig b/test/w3c/TriGTests/trig-eval-bad-03.trig
index 4024af55..4024af55 100644
--- a/test/TriGTests/trig-eval-bad-03.trig
+++ b/test/w3c/TriGTests/trig-eval-bad-03.trig
diff --git a/test/TriGTests/trig-eval-bad-04.trig b/test/w3c/TriGTests/trig-eval-bad-04.trig
index b43b6814..b43b6814 100644
--- a/test/TriGTests/trig-eval-bad-04.trig
+++ b/test/w3c/TriGTests/trig-eval-bad-04.trig
diff --git a/test/TriGTests/trig-eval-struct-01.nq b/test/w3c/TriGTests/trig-eval-struct-01.nq
index 6106c139..6106c139 100644
--- a/test/TriGTests/trig-eval-struct-01.nq
+++ b/test/w3c/TriGTests/trig-eval-struct-01.nq
diff --git a/test/TriGTests/trig-eval-struct-01.trig b/test/w3c/TriGTests/trig-eval-struct-01.trig
index c6003461..c6003461 100644
--- a/test/TriGTests/trig-eval-struct-01.trig
+++ b/test/w3c/TriGTests/trig-eval-struct-01.trig
diff --git a/test/TriGTests/trig-eval-struct-02.nq b/test/w3c/TriGTests/trig-eval-struct-02.nq
index a4e416e9..a4e416e9 100644
--- a/test/TriGTests/trig-eval-struct-02.nq
+++ b/test/w3c/TriGTests/trig-eval-struct-02.nq
diff --git a/test/TriGTests/trig-eval-struct-02.trig b/test/w3c/TriGTests/trig-eval-struct-02.trig
index 332af23c..332af23c 100644
--- a/test/TriGTests/trig-eval-struct-02.trig
+++ b/test/w3c/TriGTests/trig-eval-struct-02.trig
diff --git a/test/TriGTests/trig-graph-bad-01.trig b/test/w3c/TriGTests/trig-graph-bad-01.trig
index a247a68c..a247a68c 100644
--- a/test/TriGTests/trig-graph-bad-01.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-01.trig
diff --git a/test/TriGTests/trig-graph-bad-02.trig b/test/w3c/TriGTests/trig-graph-bad-02.trig
index 47bbda62..47bbda62 100644
--- a/test/TriGTests/trig-graph-bad-02.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-02.trig
diff --git a/test/TriGTests/trig-graph-bad-03.trig b/test/w3c/TriGTests/trig-graph-bad-03.trig
index 31af19f8..31af19f8 100644
--- a/test/TriGTests/trig-graph-bad-03.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-03.trig
diff --git a/test/TriGTests/trig-graph-bad-04.trig b/test/w3c/TriGTests/trig-graph-bad-04.trig
index 23e23a21..23e23a21 100644
--- a/test/TriGTests/trig-graph-bad-04.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-04.trig
diff --git a/test/TriGTests/trig-graph-bad-05.trig b/test/w3c/TriGTests/trig-graph-bad-05.trig
index 7bf470a6..7bf470a6 100644
--- a/test/TriGTests/trig-graph-bad-05.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-05.trig
diff --git a/test/TriGTests/trig-graph-bad-06.trig b/test/w3c/TriGTests/trig-graph-bad-06.trig
index 487ae9e0..487ae9e0 100644
--- a/test/TriGTests/trig-graph-bad-06.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-06.trig
diff --git a/test/TriGTests/trig-graph-bad-07.trig b/test/w3c/TriGTests/trig-graph-bad-07.trig
index de618384..de618384 100644
--- a/test/TriGTests/trig-graph-bad-07.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-07.trig
diff --git a/test/TriGTests/trig-graph-bad-08.trig b/test/w3c/TriGTests/trig-graph-bad-08.trig
index 190d2c0f..190d2c0f 100644
--- a/test/TriGTests/trig-graph-bad-08.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-08.trig
diff --git a/test/TriGTests/trig-graph-bad-09.trig b/test/w3c/TriGTests/trig-graph-bad-09.trig
index 3cfca535..3cfca535 100644
--- a/test/TriGTests/trig-graph-bad-09.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-09.trig
diff --git a/test/TriGTests/trig-graph-bad-10.trig b/test/w3c/TriGTests/trig-graph-bad-10.trig
index fc0531f8..fc0531f8 100644
--- a/test/TriGTests/trig-graph-bad-10.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-10.trig
diff --git a/test/TriGTests/trig-graph-bad-11.trig b/test/w3c/TriGTests/trig-graph-bad-11.trig
index c7b0ffd5..c7b0ffd5 100644
--- a/test/TriGTests/trig-graph-bad-11.trig
+++ b/test/w3c/TriGTests/trig-graph-bad-11.trig
diff --git a/test/TriGTests/trig-kw-graph-01.trig b/test/w3c/TriGTests/trig-kw-graph-01.trig
index acf739bf..acf739bf 100644
--- a/test/TriGTests/trig-kw-graph-01.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-01.trig
diff --git a/test/TriGTests/trig-kw-graph-02.trig b/test/w3c/TriGTests/trig-kw-graph-02.trig
index 6b4f904b..6b4f904b 100644
--- a/test/TriGTests/trig-kw-graph-02.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-02.trig
diff --git a/test/TriGTests/trig-kw-graph-03.trig b/test/w3c/TriGTests/trig-kw-graph-03.trig
index cfb67fe9..cfb67fe9 100644
--- a/test/TriGTests/trig-kw-graph-03.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-03.trig
diff --git a/test/TriGTests/trig-kw-graph-04.trig b/test/w3c/TriGTests/trig-kw-graph-04.trig
index 8a38e30e..8a38e30e 100644
--- a/test/TriGTests/trig-kw-graph-04.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-04.trig
diff --git a/test/TriGTests/trig-kw-graph-05.trig b/test/w3c/TriGTests/trig-kw-graph-05.trig
index acf739bf..acf739bf 100644
--- a/test/TriGTests/trig-kw-graph-05.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-05.trig
diff --git a/test/TriGTests/trig-kw-graph-06.trig b/test/w3c/TriGTests/trig-kw-graph-06.trig
index 9c5ca1a6..9c5ca1a6 100644
--- a/test/TriGTests/trig-kw-graph-06.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-06.trig
diff --git a/test/TriGTests/trig-kw-graph-07.trig b/test/w3c/TriGTests/trig-kw-graph-07.trig
index 3cd8aeb7..3cd8aeb7 100644
--- a/test/TriGTests/trig-kw-graph-07.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-07.trig
diff --git a/test/TriGTests/trig-kw-graph-08.trig b/test/w3c/TriGTests/trig-kw-graph-08.trig
index acf739bf..acf739bf 100644
--- a/test/TriGTests/trig-kw-graph-08.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-08.trig
diff --git a/test/TriGTests/trig-kw-graph-09.trig b/test/w3c/TriGTests/trig-kw-graph-09.trig
index acf739bf..acf739bf 100644
--- a/test/TriGTests/trig-kw-graph-09.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-09.trig
diff --git a/test/TriGTests/trig-kw-graph-10.trig b/test/w3c/TriGTests/trig-kw-graph-10.trig
index cfb67fe9..cfb67fe9 100644
--- a/test/TriGTests/trig-kw-graph-10.trig
+++ b/test/w3c/TriGTests/trig-kw-graph-10.trig
diff --git a/test/TriGTests/trig-subm-01.nq b/test/w3c/TriGTests/trig-subm-01.nq
index 16f21cb9..16f21cb9 100644
--- a/test/TriGTests/trig-subm-01.nq
+++ b/test/w3c/TriGTests/trig-subm-01.nq
diff --git a/test/TriGTests/trig-subm-01.trig b/test/w3c/TriGTests/trig-subm-01.trig
index 9a89c660..9a89c660 100644
--- a/test/TriGTests/trig-subm-01.trig
+++ b/test/w3c/TriGTests/trig-subm-01.trig
diff --git a/test/TriGTests/trig-subm-02.nq b/test/w3c/TriGTests/trig-subm-02.nq
index 299f1cd6..299f1cd6 100644
--- a/test/TriGTests/trig-subm-02.nq
+++ b/test/w3c/TriGTests/trig-subm-02.nq
diff --git a/test/TriGTests/trig-subm-02.trig b/test/w3c/TriGTests/trig-subm-02.trig
index c94a8039..c94a8039 100644
--- a/test/TriGTests/trig-subm-02.trig
+++ b/test/w3c/TriGTests/trig-subm-02.trig
diff --git a/test/TriGTests/trig-subm-03.nq b/test/w3c/TriGTests/trig-subm-03.nq
index aeb54197..aeb54197 100644
--- a/test/TriGTests/trig-subm-03.nq
+++ b/test/w3c/TriGTests/trig-subm-03.nq
diff --git a/test/TriGTests/trig-subm-03.trig b/test/w3c/TriGTests/trig-subm-03.trig
index b52f7c9a..b52f7c9a 100644
--- a/test/TriGTests/trig-subm-03.trig
+++ b/test/w3c/TriGTests/trig-subm-03.trig
diff --git a/test/TriGTests/trig-subm-04.nq b/test/w3c/TriGTests/trig-subm-04.nq
index acf2a1dd..acf2a1dd 100644
--- a/test/TriGTests/trig-subm-04.nq
+++ b/test/w3c/TriGTests/trig-subm-04.nq
diff --git a/test/TriGTests/trig-subm-04.trig b/test/w3c/TriGTests/trig-subm-04.trig
index 2f57b30b..2f57b30b 100644
--- a/test/TriGTests/trig-subm-04.trig
+++ b/test/w3c/TriGTests/trig-subm-04.trig
diff --git a/test/TriGTests/trig-subm-05.nq b/test/w3c/TriGTests/trig-subm-05.nq
index cf4eb939..cf4eb939 100644
--- a/test/TriGTests/trig-subm-05.nq
+++ b/test/w3c/TriGTests/trig-subm-05.nq
diff --git a/test/TriGTests/trig-subm-05.trig b/test/w3c/TriGTests/trig-subm-05.trig
index 8c202b99..8c202b99 100644
--- a/test/TriGTests/trig-subm-05.trig
+++ b/test/w3c/TriGTests/trig-subm-05.trig
diff --git a/test/TriGTests/trig-subm-06.nq b/test/w3c/TriGTests/trig-subm-06.nq
index 4ede34b6..4ede34b6 100644
--- a/test/TriGTests/trig-subm-06.nq
+++ b/test/w3c/TriGTests/trig-subm-06.nq
diff --git a/test/TriGTests/trig-subm-06.trig b/test/w3c/TriGTests/trig-subm-06.trig
index 280c48d5..280c48d5 100644
--- a/test/TriGTests/trig-subm-06.trig
+++ b/test/w3c/TriGTests/trig-subm-06.trig
diff --git a/test/TriGTests/trig-subm-07.nq b/test/w3c/TriGTests/trig-subm-07.nq
index 7c96d3ba..7c96d3ba 100644
--- a/test/TriGTests/trig-subm-07.nq
+++ b/test/w3c/TriGTests/trig-subm-07.nq
diff --git a/test/TriGTests/trig-subm-07.trig b/test/w3c/TriGTests/trig-subm-07.trig
index b5e254af..b5e254af 100644
--- a/test/TriGTests/trig-subm-07.trig
+++ b/test/w3c/TriGTests/trig-subm-07.trig
diff --git a/test/TriGTests/trig-subm-08.nq b/test/w3c/TriGTests/trig-subm-08.nq
index fbb430bd..fbb430bd 100644
--- a/test/TriGTests/trig-subm-08.nq
+++ b/test/w3c/TriGTests/trig-subm-08.nq
diff --git a/test/TriGTests/trig-subm-08.trig b/test/w3c/TriGTests/trig-subm-08.trig
index 7e88c18c..7e88c18c 100644
--- a/test/TriGTests/trig-subm-08.trig
+++ b/test/w3c/TriGTests/trig-subm-08.trig
diff --git a/test/TriGTests/trig-subm-09.nq b/test/w3c/TriGTests/trig-subm-09.nq
index 7c2c83b8..7c2c83b8 100644
--- a/test/TriGTests/trig-subm-09.nq
+++ b/test/w3c/TriGTests/trig-subm-09.nq
diff --git a/test/TriGTests/trig-subm-09.trig b/test/w3c/TriGTests/trig-subm-09.trig
index 7cbd40a8..7cbd40a8 100644
--- a/test/TriGTests/trig-subm-09.trig
+++ b/test/w3c/TriGTests/trig-subm-09.trig
diff --git a/test/TriGTests/trig-subm-10.nq b/test/w3c/TriGTests/trig-subm-10.nq
index 3a84a4c6..3a84a4c6 100644
--- a/test/TriGTests/trig-subm-10.nq
+++ b/test/w3c/TriGTests/trig-subm-10.nq
diff --git a/test/TriGTests/trig-subm-10.trig b/test/w3c/TriGTests/trig-subm-10.trig
index 23bd02de..23bd02de 100644
--- a/test/TriGTests/trig-subm-10.trig
+++ b/test/w3c/TriGTests/trig-subm-10.trig
diff --git a/test/TriGTests/trig-subm-11.nq b/test/w3c/TriGTests/trig-subm-11.nq
index 76147a3a..76147a3a 100644
--- a/test/TriGTests/trig-subm-11.nq
+++ b/test/w3c/TriGTests/trig-subm-11.nq
diff --git a/test/TriGTests/trig-subm-11.trig b/test/w3c/TriGTests/trig-subm-11.trig
index bb1c4991..bb1c4991 100644
--- a/test/TriGTests/trig-subm-11.trig
+++ b/test/w3c/TriGTests/trig-subm-11.trig
diff --git a/test/TriGTests/trig-subm-12.nq b/test/w3c/TriGTests/trig-subm-12.nq
index 32b15c50..32b15c50 100644
--- a/test/TriGTests/trig-subm-12.nq
+++ b/test/w3c/TriGTests/trig-subm-12.nq
diff --git a/test/TriGTests/trig-subm-12.trig b/test/w3c/TriGTests/trig-subm-12.trig
index b0f8ff83..b0f8ff83 100644
--- a/test/TriGTests/trig-subm-12.trig
+++ b/test/w3c/TriGTests/trig-subm-12.trig
diff --git a/test/TriGTests/trig-subm-13.nq b/test/w3c/TriGTests/trig-subm-13.nq
index 84c2a2e5..84c2a2e5 100644
--- a/test/TriGTests/trig-subm-13.nq
+++ b/test/w3c/TriGTests/trig-subm-13.nq
diff --git a/test/TriGTests/trig-subm-13.trig b/test/w3c/TriGTests/trig-subm-13.trig
index 8d1b44da..8d1b44da 100644
--- a/test/TriGTests/trig-subm-13.trig
+++ b/test/w3c/TriGTests/trig-subm-13.trig
diff --git a/test/TriGTests/trig-subm-14.nq b/test/w3c/TriGTests/trig-subm-14.nq
index 89f5b292..89f5b292 100644
--- a/test/TriGTests/trig-subm-14.nq
+++ b/test/w3c/TriGTests/trig-subm-14.nq
diff --git a/test/TriGTests/trig-subm-14.trig b/test/w3c/TriGTests/trig-subm-14.trig
index c70300e1..c70300e1 100644
--- a/test/TriGTests/trig-subm-14.trig
+++ b/test/w3c/TriGTests/trig-subm-14.trig
diff --git a/test/TriGTests/trig-subm-15.nq b/test/w3c/TriGTests/trig-subm-15.nq
index 8d01c44f..8d01c44f 100644
--- a/test/TriGTests/trig-subm-15.nq
+++ b/test/w3c/TriGTests/trig-subm-15.nq
diff --git a/test/TriGTests/trig-subm-15.trig b/test/w3c/TriGTests/trig-subm-15.trig
index 93fbc41a..93fbc41a 100644
--- a/test/TriGTests/trig-subm-15.trig
+++ b/test/w3c/TriGTests/trig-subm-15.trig
diff --git a/test/TriGTests/trig-subm-16.nq b/test/w3c/TriGTests/trig-subm-16.nq
index 2e5fac4e..2e5fac4e 100644
--- a/test/TriGTests/trig-subm-16.nq
+++ b/test/w3c/TriGTests/trig-subm-16.nq
diff --git a/test/TriGTests/trig-subm-16.trig b/test/w3c/TriGTests/trig-subm-16.trig
index 86cb22d5..86cb22d5 100644
--- a/test/TriGTests/trig-subm-16.trig
+++ b/test/w3c/TriGTests/trig-subm-16.trig
diff --git a/test/TriGTests/trig-subm-17.nq b/test/w3c/TriGTests/trig-subm-17.nq
index 7c5d273f..7c5d273f 100644
--- a/test/TriGTests/trig-subm-17.nq
+++ b/test/w3c/TriGTests/trig-subm-17.nq
diff --git a/test/TriGTests/trig-subm-17.trig b/test/w3c/TriGTests/trig-subm-17.trig
index 345ca231..345ca231 100644
--- a/test/TriGTests/trig-subm-17.trig
+++ b/test/w3c/TriGTests/trig-subm-17.trig
diff --git a/test/TriGTests/trig-subm-18.nq b/test/w3c/TriGTests/trig-subm-18.nq
index 58b0a4c4..58b0a4c4 100644
--- a/test/TriGTests/trig-subm-18.nq
+++ b/test/w3c/TriGTests/trig-subm-18.nq
diff --git a/test/TriGTests/trig-subm-18.trig b/test/w3c/TriGTests/trig-subm-18.trig
index f5b4a516..f5b4a516 100644
--- a/test/TriGTests/trig-subm-18.trig
+++ b/test/w3c/TriGTests/trig-subm-18.trig
diff --git a/test/TriGTests/trig-subm-19.nq b/test/w3c/TriGTests/trig-subm-19.nq
index b3cf8075..b3cf8075 100644
--- a/test/TriGTests/trig-subm-19.nq
+++ b/test/w3c/TriGTests/trig-subm-19.nq
diff --git a/test/TriGTests/trig-subm-19.trig b/test/w3c/TriGTests/trig-subm-19.trig
index 7cd14eee..7cd14eee 100644
--- a/test/TriGTests/trig-subm-19.trig
+++ b/test/w3c/TriGTests/trig-subm-19.trig
diff --git a/test/TriGTests/trig-subm-20.nq b/test/w3c/TriGTests/trig-subm-20.nq
index 46f48c74..46f48c74 100644
--- a/test/TriGTests/trig-subm-20.nq
+++ b/test/w3c/TriGTests/trig-subm-20.nq
diff --git a/test/TriGTests/trig-subm-20.trig b/test/w3c/TriGTests/trig-subm-20.trig
index 6e3032e5..6e3032e5 100644
--- a/test/TriGTests/trig-subm-20.trig
+++ b/test/w3c/TriGTests/trig-subm-20.trig
diff --git a/test/TriGTests/trig-subm-21.nq b/test/w3c/TriGTests/trig-subm-21.nq
index 90aec6da..90aec6da 100644
--- a/test/TriGTests/trig-subm-21.nq
+++ b/test/w3c/TriGTests/trig-subm-21.nq
diff --git a/test/TriGTests/trig-subm-21.trig b/test/w3c/TriGTests/trig-subm-21.trig
index 05870fbd..05870fbd 100644
--- a/test/TriGTests/trig-subm-21.trig
+++ b/test/w3c/TriGTests/trig-subm-21.trig
diff --git a/test/TriGTests/trig-subm-22.nq b/test/w3c/TriGTests/trig-subm-22.nq
index 01ab3571..01ab3571 100644
--- a/test/TriGTests/trig-subm-22.nq
+++ b/test/w3c/TriGTests/trig-subm-22.nq
diff --git a/test/TriGTests/trig-subm-22.trig b/test/w3c/TriGTests/trig-subm-22.trig
index 2b546609..2b546609 100644
--- a/test/TriGTests/trig-subm-22.trig
+++ b/test/w3c/TriGTests/trig-subm-22.trig
diff --git a/test/TriGTests/trig-subm-23.nq b/test/w3c/TriGTests/trig-subm-23.nq
index 11328c97..11328c97 100644
--- a/test/TriGTests/trig-subm-23.nq
+++ b/test/w3c/TriGTests/trig-subm-23.nq
diff --git a/test/TriGTests/trig-subm-23.trig b/test/w3c/TriGTests/trig-subm-23.trig
index 3cb24f50..3cb24f50 100644
--- a/test/TriGTests/trig-subm-23.trig
+++ b/test/w3c/TriGTests/trig-subm-23.trig
diff --git a/test/TriGTests/trig-subm-24.nq b/test/w3c/TriGTests/trig-subm-24.nq
index 9de4a324..9de4a324 100644
--- a/test/TriGTests/trig-subm-24.nq
+++ b/test/w3c/TriGTests/trig-subm-24.nq
diff --git a/test/TriGTests/trig-subm-24.trig b/test/w3c/TriGTests/trig-subm-24.trig
index 22ae97ca..22ae97ca 100644
--- a/test/TriGTests/trig-subm-24.trig
+++ b/test/w3c/TriGTests/trig-subm-24.trig
diff --git a/test/TriGTests/trig-subm-25.nq b/test/w3c/TriGTests/trig-subm-25.nq
index bcb4647a..bcb4647a 100644
--- a/test/TriGTests/trig-subm-25.nq
+++ b/test/w3c/TriGTests/trig-subm-25.nq
diff --git a/test/TriGTests/trig-subm-25.trig b/test/w3c/TriGTests/trig-subm-25.trig
index 7c3b9f2a..7c3b9f2a 100644
--- a/test/TriGTests/trig-subm-25.trig
+++ b/test/w3c/TriGTests/trig-subm-25.trig
diff --git a/test/TriGTests/trig-subm-26.nq b/test/w3c/TriGTests/trig-subm-26.nq
index 7357dd40..7357dd40 100644
--- a/test/TriGTests/trig-subm-26.nq
+++ b/test/w3c/TriGTests/trig-subm-26.nq
diff --git a/test/TriGTests/trig-subm-26.trig b/test/w3c/TriGTests/trig-subm-26.trig
index c590800f..c590800f 100644
--- a/test/TriGTests/trig-subm-26.trig
+++ b/test/w3c/TriGTests/trig-subm-26.trig
diff --git a/test/TriGTests/trig-subm-27.nq b/test/w3c/TriGTests/trig-subm-27.nq
index 95e9abbc..95e9abbc 100644
--- a/test/TriGTests/trig-subm-27.nq
+++ b/test/w3c/TriGTests/trig-subm-27.nq
diff --git a/test/TriGTests/trig-subm-27.trig b/test/w3c/TriGTests/trig-subm-27.trig
index 4bb98b8f..4bb98b8f 100644
--- a/test/TriGTests/trig-subm-27.trig
+++ b/test/w3c/TriGTests/trig-subm-27.trig
diff --git a/test/TriGTests/trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig b/test/w3c/TriGTests/trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig
index 7748dd1e..7748dd1e 100644
--- a/test/TriGTests/trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig
diff --git a/test/TriGTests/trig-syntax-bad-base-01.trig b/test/w3c/TriGTests/trig-syntax-bad-base-01.trig
index 7b0412f8..7b0412f8 100644
--- a/test/TriGTests/trig-syntax-bad-base-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-base-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-base-02.trig b/test/w3c/TriGTests/trig-syntax-bad-base-02.trig
index 1b2e4845..1b2e4845 100644
--- a/test/TriGTests/trig-syntax-bad-base-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-base-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-base-03.trig b/test/w3c/TriGTests/trig-syntax-bad-base-03.trig
index b8f587fa..b8f587fa 100644
--- a/test/TriGTests/trig-syntax-bad-base-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-base-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-base-04.trig b/test/w3c/TriGTests/trig-syntax-bad-base-04.trig
index 83c5789b..83c5789b 100644
--- a/test/TriGTests/trig-syntax-bad-base-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-base-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-base-05.trig b/test/w3c/TriGTests/trig-syntax-bad-base-05.trig
index fa915d53..fa915d53 100644
--- a/test/TriGTests/trig-syntax-bad-base-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-base-05.trig
diff --git a/test/TriGTests/trig-syntax-bad-blank-label-dot-end.trig b/test/w3c/TriGTests/trig-syntax-bad-blank-label-dot-end.trig
index 33d5edf2..33d5edf2 100644
--- a/test/TriGTests/trig-syntax-bad-blank-label-dot-end.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-blank-label-dot-end.trig
diff --git a/test/TriGTests/trig-syntax-bad-esc-01.trig b/test/w3c/TriGTests/trig-syntax-bad-esc-01.trig
index abe7fde0..abe7fde0 100644
--- a/test/TriGTests/trig-syntax-bad-esc-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-esc-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-esc-02.trig b/test/w3c/TriGTests/trig-syntax-bad-esc-02.trig
index 80f18c81..80f18c81 100644
--- a/test/TriGTests/trig-syntax-bad-esc-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-esc-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-esc-03.trig b/test/w3c/TriGTests/trig-syntax-bad-esc-03.trig
index b45f7044..b45f7044 100644
--- a/test/TriGTests/trig-syntax-bad-esc-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-esc-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-esc-04.trig b/test/w3c/TriGTests/trig-syntax-bad-esc-04.trig
index b45f7044..b45f7044 100644
--- a/test/TriGTests/trig-syntax-bad-esc-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-esc-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-kw-01.trig b/test/w3c/TriGTests/trig-syntax-bad-kw-01.trig
index 75753b2d..75753b2d 100644
--- a/test/TriGTests/trig-syntax-bad-kw-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-kw-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-kw-02.trig b/test/w3c/TriGTests/trig-syntax-bad-kw-02.trig
index 036179dd..036179dd 100644
--- a/test/TriGTests/trig-syntax-bad-kw-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-kw-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-kw-03.trig b/test/w3c/TriGTests/trig-syntax-bad-kw-03.trig
index 84f456e5..84f456e5 100644
--- a/test/TriGTests/trig-syntax-bad-kw-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-kw-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-kw-04.trig b/test/w3c/TriGTests/trig-syntax-bad-kw-04.trig
index 28d864c4..28d864c4 100644
--- a/test/TriGTests/trig-syntax-bad-kw-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-kw-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-kw-05.trig b/test/w3c/TriGTests/trig-syntax-bad-kw-05.trig
index c12694bf..c12694bf 100644
--- a/test/TriGTests/trig-syntax-bad-kw-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-kw-05.trig
diff --git a/test/TriGTests/trig-syntax-bad-lang-01.trig b/test/w3c/TriGTests/trig-syntax-bad-lang-01.trig
index a2032634..a2032634 100644
--- a/test/TriGTests/trig-syntax-bad-lang-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-lang-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-list-01.trig b/test/w3c/TriGTests/trig-syntax-bad-list-01.trig
index 15d82710..15d82710 100644
--- a/test/TriGTests/trig-syntax-bad-list-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-list-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-list-02.trig b/test/w3c/TriGTests/trig-syntax-bad-list-02.trig
index 15d82710..15d82710 100644
--- a/test/TriGTests/trig-syntax-bad-list-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-list-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-list-03.trig b/test/w3c/TriGTests/trig-syntax-bad-list-03.trig
index 6b5269dd..6b5269dd 100644
--- a/test/TriGTests/trig-syntax-bad-list-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-list-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-list-04.trig b/test/w3c/TriGTests/trig-syntax-bad-list-04.trig
index 377846a9..377846a9 100644
--- a/test/TriGTests/trig-syntax-bad-list-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-list-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-ln-dash-start.trig b/test/w3c/TriGTests/trig-syntax-bad-ln-dash-start.trig
index 48f78eed..48f78eed 100644
--- a/test/TriGTests/trig-syntax-bad-ln-dash-start.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-ln-dash-start.trig
diff --git a/test/TriGTests/trig-syntax-bad-ln-escape-start.trig b/test/w3c/TriGTests/trig-syntax-bad-ln-escape-start.trig
index d3e71e4e..d3e71e4e 100644
--- a/test/TriGTests/trig-syntax-bad-ln-escape-start.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-ln-escape-start.trig
diff --git a/test/TriGTests/trig-syntax-bad-ln-escape.trig b/test/w3c/TriGTests/trig-syntax-bad-ln-escape.trig
index dcdd0592..dcdd0592 100644
--- a/test/TriGTests/trig-syntax-bad-ln-escape.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-ln-escape.trig
diff --git a/test/TriGTests/trig-syntax-bad-missing-ns-dot-end.trig b/test/w3c/TriGTests/trig-syntax-bad-missing-ns-dot-end.trig
index 7fe09943..7fe09943 100644
--- a/test/TriGTests/trig-syntax-bad-missing-ns-dot-end.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-missing-ns-dot-end.trig
diff --git a/test/TriGTests/trig-syntax-bad-missing-ns-dot-start.trig b/test/w3c/TriGTests/trig-syntax-bad-missing-ns-dot-start.trig
index 3ae9b6bb..3ae9b6bb 100644
--- a/test/TriGTests/trig-syntax-bad-missing-ns-dot-start.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-missing-ns-dot-start.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-01.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-01.trig
index 9dbf21e2..9dbf21e2 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-02.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-02.trig
index 8edf2c2b..8edf2c2b 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-03.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-03.trig
index bb21bf08..bb21bf08 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-04.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-04.trig
index adee6b55..adee6b55 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-05.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-05.trig
index 2fbf0840..2fbf0840 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-05.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-06.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-06.trig
index d1945544..d1945544 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-06.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-06.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-07.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-07.trig
index ece79325..ece79325 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-07.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-07.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-08.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-08.trig
index ece79325..ece79325 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-08.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-08.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-09.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-09.trig
index cc70bc12..cc70bc12 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-09.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-09.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-10.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-10.trig
index 7470dda3..7470dda3 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-10.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-10.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-11.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-11.trig
index dabadf02..dabadf02 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-11.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-11.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-12.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-12.trig
index 5a6c3562..5a6c3562 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-12.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-12.trig
diff --git a/test/TriGTests/trig-syntax-bad-n3-extras-13.trig b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-13.trig
index c4fe67a0..c4fe67a0 100644
--- a/test/TriGTests/trig-syntax-bad-n3-extras-13.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-n3-extras-13.trig
diff --git a/test/TriGTests/trig-syntax-bad-ns-dot-end.trig b/test/w3c/TriGTests/trig-syntax-bad-ns-dot-end.trig
index d2b53225..d2b53225 100644
--- a/test/TriGTests/trig-syntax-bad-ns-dot-end.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-ns-dot-end.trig
diff --git a/test/TriGTests/trig-syntax-bad-ns-dot-start.trig b/test/w3c/TriGTests/trig-syntax-bad-ns-dot-start.trig
index 9cebce12..9cebce12 100644
--- a/test/TriGTests/trig-syntax-bad-ns-dot-start.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-ns-dot-start.trig
diff --git a/test/TriGTests/trig-syntax-bad-num-01.trig b/test/w3c/TriGTests/trig-syntax-bad-num-01.trig
index 87fa61d4..87fa61d4 100644
--- a/test/TriGTests/trig-syntax-bad-num-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-num-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-num-02.trig b/test/w3c/TriGTests/trig-syntax-bad-num-02.trig
index 4e257b08..4e257b08 100644
--- a/test/TriGTests/trig-syntax-bad-num-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-num-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-num-03.trig b/test/w3c/TriGTests/trig-syntax-bad-num-03.trig
index 72414507..72414507 100644
--- a/test/TriGTests/trig-syntax-bad-num-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-num-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-num-04.trig b/test/w3c/TriGTests/trig-syntax-bad-num-04.trig
index c5828732..c5828732 100644
--- a/test/TriGTests/trig-syntax-bad-num-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-num-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-num-05.trig b/test/w3c/TriGTests/trig-syntax-bad-num-05.trig
index 7de52461..7de52461 100644
--- a/test/TriGTests/trig-syntax-bad-num-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-num-05.trig
diff --git a/test/TriGTests/trig-syntax-bad-number-dot-in-anon.trig b/test/w3c/TriGTests/trig-syntax-bad-number-dot-in-anon.trig
index 3c4b8e45..3c4b8e45 100644
--- a/test/TriGTests/trig-syntax-bad-number-dot-in-anon.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-number-dot-in-anon.trig
diff --git a/test/TriGTests/trig-syntax-bad-pname-01.trig b/test/w3c/TriGTests/trig-syntax-bad-pname-01.trig
index a03be7af..a03be7af 100644
--- a/test/TriGTests/trig-syntax-bad-pname-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-pname-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-pname-02.trig b/test/w3c/TriGTests/trig-syntax-bad-pname-02.trig
index 39d14ee4..39d14ee4 100644
--- a/test/TriGTests/trig-syntax-bad-pname-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-pname-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-pname-03.trig b/test/w3c/TriGTests/trig-syntax-bad-pname-03.trig
index 5ed44f65..5ed44f65 100644
--- a/test/TriGTests/trig-syntax-bad-pname-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-pname-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-prefix-01.trig b/test/w3c/TriGTests/trig-syntax-bad-prefix-01.trig
index 32d781d1..32d781d1 100644
--- a/test/TriGTests/trig-syntax-bad-prefix-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-prefix-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-prefix-02.trig b/test/w3c/TriGTests/trig-syntax-bad-prefix-02.trig
index 6d03cf5f..6d03cf5f 100644
--- a/test/TriGTests/trig-syntax-bad-prefix-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-prefix-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-prefix-03.trig b/test/w3c/TriGTests/trig-syntax-bad-prefix-03.trig
index 1ab01e7b..1ab01e7b 100644
--- a/test/TriGTests/trig-syntax-bad-prefix-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-prefix-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-prefix-04.trig b/test/w3c/TriGTests/trig-syntax-bad-prefix-04.trig
index dbbda05b..dbbda05b 100644
--- a/test/TriGTests/trig-syntax-bad-prefix-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-prefix-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-prefix-05.trig b/test/w3c/TriGTests/trig-syntax-bad-prefix-05.trig
index 6d145e07..6d145e07 100644
--- a/test/TriGTests/trig-syntax-bad-prefix-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-prefix-05.trig
diff --git a/test/TriGTests/trig-syntax-bad-prefix-06.trig b/test/w3c/TriGTests/trig-syntax-bad-prefix-06.trig
index 52939065..52939065 100644
--- a/test/TriGTests/trig-syntax-bad-prefix-06.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-prefix-06.trig
diff --git a/test/TriGTests/trig-syntax-bad-prefix-07.trig b/test/w3c/TriGTests/trig-syntax-bad-prefix-07.trig
index 1230063a..1230063a 100644
--- a/test/TriGTests/trig-syntax-bad-prefix-07.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-prefix-07.trig
diff --git a/test/TriGTests/trig-syntax-bad-string-01.trig b/test/w3c/TriGTests/trig-syntax-bad-string-01.trig
index 9decfb3c..9decfb3c 100644
--- a/test/TriGTests/trig-syntax-bad-string-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-string-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-string-02.trig b/test/w3c/TriGTests/trig-syntax-bad-string-02.trig
index 95537104..95537104 100644
--- a/test/TriGTests/trig-syntax-bad-string-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-string-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-string-03.trig b/test/w3c/TriGTests/trig-syntax-bad-string-03.trig
index b60d18b8..b60d18b8 100644
--- a/test/TriGTests/trig-syntax-bad-string-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-string-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-string-04.trig b/test/w3c/TriGTests/trig-syntax-bad-string-04.trig
index 06173937..06173937 100644
--- a/test/TriGTests/trig-syntax-bad-string-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-string-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-string-05.trig b/test/w3c/TriGTests/trig-syntax-bad-string-05.trig
index 52e3fed4..52e3fed4 100644
--- a/test/TriGTests/trig-syntax-bad-string-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-string-05.trig
diff --git a/test/TriGTests/trig-syntax-bad-string-06.trig b/test/w3c/TriGTests/trig-syntax-bad-string-06.trig
index e4c9d936..e4c9d936 100644
--- a/test/TriGTests/trig-syntax-bad-string-06.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-string-06.trig
diff --git a/test/TriGTests/trig-syntax-bad-string-07.trig b/test/w3c/TriGTests/trig-syntax-bad-string-07.trig
index de68cb4a..de68cb4a 100644
--- a/test/TriGTests/trig-syntax-bad-string-07.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-string-07.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-02.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-02.trig
index 1f38c451..1f38c451 100644
--- a/test/TriGTests/trig-syntax-bad-struct-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-03.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-03.trig
index b7e97b81..b7e97b81 100644
--- a/test/TriGTests/trig-syntax-bad-struct-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-04.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-04.trig
index 319d1067..319d1067 100644
--- a/test/TriGTests/trig-syntax-bad-struct-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-05.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-05.trig
index 317b6326..317b6326 100644
--- a/test/TriGTests/trig-syntax-bad-struct-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-05.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-06.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-06.trig
index 8e6e7202..8e6e7202 100644
--- a/test/TriGTests/trig-syntax-bad-struct-06.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-06.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-07.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-07.trig
index 91152ba3..91152ba3 100644
--- a/test/TriGTests/trig-syntax-bad-struct-07.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-07.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-09.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-09.trig
index abc20261..abc20261 100644
--- a/test/TriGTests/trig-syntax-bad-struct-09.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-09.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-10.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-10.trig
index 5d5c58fa..5d5c58fa 100644
--- a/test/TriGTests/trig-syntax-bad-struct-10.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-10.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-12.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-12.trig
index b7bdff6a..b7bdff6a 100644
--- a/test/TriGTests/trig-syntax-bad-struct-12.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-12.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-13.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-13.trig
index 0712e0f0..0712e0f0 100644
--- a/test/TriGTests/trig-syntax-bad-struct-13.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-13.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-14.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-14.trig
index 69bc9c21..69bc9c21 100644
--- a/test/TriGTests/trig-syntax-bad-struct-14.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-14.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-15.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-15.trig
index 27be5519..27be5519 100644
--- a/test/TriGTests/trig-syntax-bad-struct-15.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-15.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-16.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-16.trig
index b08748f4..b08748f4 100644
--- a/test/TriGTests/trig-syntax-bad-struct-16.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-16.trig
diff --git a/test/TriGTests/trig-syntax-bad-struct-17.trig b/test/w3c/TriGTests/trig-syntax-bad-struct-17.trig
index cdd301a1..cdd301a1 100644
--- a/test/TriGTests/trig-syntax-bad-struct-17.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-struct-17.trig
diff --git a/test/TriGTests/trig-syntax-bad-uri-01.trig b/test/w3c/TriGTests/trig-syntax-bad-uri-01.trig
index ed06b92d..ed06b92d 100644
--- a/test/TriGTests/trig-syntax-bad-uri-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-uri-01.trig
diff --git a/test/TriGTests/trig-syntax-bad-uri-02.trig b/test/w3c/TriGTests/trig-syntax-bad-uri-02.trig
index fb862172..fb862172 100644
--- a/test/TriGTests/trig-syntax-bad-uri-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-uri-02.trig
diff --git a/test/TriGTests/trig-syntax-bad-uri-03.trig b/test/w3c/TriGTests/trig-syntax-bad-uri-03.trig
index 7fa62dcc..7fa62dcc 100644
--- a/test/TriGTests/trig-syntax-bad-uri-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-uri-03.trig
diff --git a/test/TriGTests/trig-syntax-bad-uri-04.trig b/test/w3c/TriGTests/trig-syntax-bad-uri-04.trig
index ba9cd2d7..ba9cd2d7 100644
--- a/test/TriGTests/trig-syntax-bad-uri-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-uri-04.trig
diff --git a/test/TriGTests/trig-syntax-bad-uri-05.trig b/test/w3c/TriGTests/trig-syntax-bad-uri-05.trig
index d332a6e6..d332a6e6 100644
--- a/test/TriGTests/trig-syntax-bad-uri-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-bad-uri-05.trig
diff --git a/test/TriGTests/trig-syntax-base-01.trig b/test/w3c/TriGTests/trig-syntax-base-01.trig
index dff1b3b4..dff1b3b4 100644
--- a/test/TriGTests/trig-syntax-base-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-base-01.trig
diff --git a/test/TriGTests/trig-syntax-base-02.trig b/test/w3c/TriGTests/trig-syntax-base-02.trig
index 04f1bfdb..04f1bfdb 100644
--- a/test/TriGTests/trig-syntax-base-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-base-02.trig
diff --git a/test/TriGTests/trig-syntax-base-03.trig b/test/w3c/TriGTests/trig-syntax-base-03.trig
index 2b7ae01d..2b7ae01d 100644
--- a/test/TriGTests/trig-syntax-base-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-base-03.trig
diff --git a/test/TriGTests/trig-syntax-base-04.trig b/test/w3c/TriGTests/trig-syntax-base-04.trig
index ad742cff..ad742cff 100644
--- a/test/TriGTests/trig-syntax-base-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-base-04.trig
diff --git a/test/TriGTests/trig-syntax-blank-label.trig b/test/w3c/TriGTests/trig-syntax-blank-label.trig
index 2cebf8f5..2cebf8f5 100644
--- a/test/TriGTests/trig-syntax-blank-label.trig
+++ b/test/w3c/TriGTests/trig-syntax-blank-label.trig
diff --git a/test/TriGTests/trig-syntax-bnode-01.trig b/test/w3c/TriGTests/trig-syntax-bnode-01.trig
index 50c66c4d..50c66c4d 100644
--- a/test/TriGTests/trig-syntax-bnode-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-01.trig
diff --git a/test/TriGTests/trig-syntax-bnode-02.trig b/test/w3c/TriGTests/trig-syntax-bnode-02.trig
index 745dc11c..745dc11c 100644
--- a/test/TriGTests/trig-syntax-bnode-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-02.trig
diff --git a/test/TriGTests/trig-syntax-bnode-03.trig b/test/w3c/TriGTests/trig-syntax-bnode-03.trig
index 292b2791..292b2791 100644
--- a/test/TriGTests/trig-syntax-bnode-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-03.trig
diff --git a/test/TriGTests/trig-syntax-bnode-04.trig b/test/w3c/TriGTests/trig-syntax-bnode-04.trig
index 7bde07d6..7bde07d6 100644
--- a/test/TriGTests/trig-syntax-bnode-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-04.trig
diff --git a/test/TriGTests/trig-syntax-bnode-05.trig b/test/w3c/TriGTests/trig-syntax-bnode-05.trig
index 86419083..86419083 100644
--- a/test/TriGTests/trig-syntax-bnode-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-05.trig
diff --git a/test/TriGTests/trig-syntax-bnode-06.trig b/test/w3c/TriGTests/trig-syntax-bnode-06.trig
index 4f06e5fc..4f06e5fc 100644
--- a/test/TriGTests/trig-syntax-bnode-06.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-06.trig
diff --git a/test/TriGTests/trig-syntax-bnode-07.trig b/test/w3c/TriGTests/trig-syntax-bnode-07.trig
index 001e9ba0..001e9ba0 100644
--- a/test/TriGTests/trig-syntax-bnode-07.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-07.trig
diff --git a/test/TriGTests/trig-syntax-bnode-08.trig b/test/w3c/TriGTests/trig-syntax-bnode-08.trig
index 853ab8af..853ab8af 100644
--- a/test/TriGTests/trig-syntax-bnode-08.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-08.trig
diff --git a/test/TriGTests/trig-syntax-bnode-09.trig b/test/w3c/TriGTests/trig-syntax-bnode-09.trig
index 36b1eca8..36b1eca8 100644
--- a/test/TriGTests/trig-syntax-bnode-09.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-09.trig
diff --git a/test/TriGTests/trig-syntax-bnode-10.trig b/test/w3c/TriGTests/trig-syntax-bnode-10.trig
index b6d308dd..b6d308dd 100644
--- a/test/TriGTests/trig-syntax-bnode-10.trig
+++ b/test/w3c/TriGTests/trig-syntax-bnode-10.trig
diff --git a/test/TriGTests/trig-syntax-datatypes-01.trig b/test/w3c/TriGTests/trig-syntax-datatypes-01.trig
index 304793af..304793af 100644
--- a/test/TriGTests/trig-syntax-datatypes-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-datatypes-01.trig
diff --git a/test/TriGTests/trig-syntax-datatypes-02.trig b/test/w3c/TriGTests/trig-syntax-datatypes-02.trig
index 7daeb166..7daeb166 100644
--- a/test/TriGTests/trig-syntax-datatypes-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-datatypes-02.trig
diff --git a/test/TriGTests/trig-syntax-file-01.trig b/test/w3c/TriGTests/trig-syntax-file-01.trig
index e69de29b..e69de29b 100644
--- a/test/TriGTests/trig-syntax-file-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-file-01.trig
diff --git a/test/TriGTests/trig-syntax-file-02.trig b/test/w3c/TriGTests/trig-syntax-file-02.trig
index e6d327d5..e6d327d5 100644
--- a/test/TriGTests/trig-syntax-file-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-file-02.trig
diff --git a/test/TriGTests/trig-syntax-file-03.trig b/test/w3c/TriGTests/trig-syntax-file-03.trig
index a9ca0358..a9ca0358 100644
--- a/test/TriGTests/trig-syntax-file-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-file-03.trig
diff --git a/test/TriGTests/trig-syntax-kw-01.trig b/test/w3c/TriGTests/trig-syntax-kw-01.trig
index c1a426bb..c1a426bb 100644
--- a/test/TriGTests/trig-syntax-kw-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-kw-01.trig
diff --git a/test/TriGTests/trig-syntax-kw-02.trig b/test/w3c/TriGTests/trig-syntax-kw-02.trig
index 7ceaee70..7ceaee70 100644
--- a/test/TriGTests/trig-syntax-kw-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-kw-02.trig
diff --git a/test/TriGTests/trig-syntax-kw-03.trig b/test/w3c/TriGTests/trig-syntax-kw-03.trig
index 3c9e1405..3c9e1405 100644
--- a/test/TriGTests/trig-syntax-kw-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-kw-03.trig
diff --git a/test/TriGTests/trig-syntax-lists-01.trig b/test/w3c/TriGTests/trig-syntax-lists-01.trig
index ff2de971..ff2de971 100644
--- a/test/TriGTests/trig-syntax-lists-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-lists-01.trig
diff --git a/test/TriGTests/trig-syntax-lists-02.trig b/test/w3c/TriGTests/trig-syntax-lists-02.trig
index cce118aa..cce118aa 100644
--- a/test/TriGTests/trig-syntax-lists-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-lists-02.trig
diff --git a/test/TriGTests/trig-syntax-lists-03.trig b/test/w3c/TriGTests/trig-syntax-lists-03.trig
index ee59d4c1..ee59d4c1 100644
--- a/test/TriGTests/trig-syntax-lists-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-lists-03.trig
diff --git a/test/TriGTests/trig-syntax-lists-04.trig b/test/w3c/TriGTests/trig-syntax-lists-04.trig
index 6b26b478..6b26b478 100644
--- a/test/TriGTests/trig-syntax-lists-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-lists-04.trig
diff --git a/test/TriGTests/trig-syntax-lists-05.trig b/test/w3c/TriGTests/trig-syntax-lists-05.trig
index 9e103cdd..9e103cdd 100644
--- a/test/TriGTests/trig-syntax-lists-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-lists-05.trig
diff --git a/test/TriGTests/trig-syntax-ln-colons.trig b/test/w3c/TriGTests/trig-syntax-ln-colons.trig
index d0fd5d45..d0fd5d45 100644
--- a/test/TriGTests/trig-syntax-ln-colons.trig
+++ b/test/w3c/TriGTests/trig-syntax-ln-colons.trig
diff --git a/test/TriGTests/trig-syntax-ln-dots.trig b/test/w3c/TriGTests/trig-syntax-ln-dots.trig
index f420e8a9..f420e8a9 100644
--- a/test/TriGTests/trig-syntax-ln-dots.trig
+++ b/test/w3c/TriGTests/trig-syntax-ln-dots.trig
diff --git a/test/TriGTests/trig-syntax-minimal-whitespace-01.trig b/test/w3c/TriGTests/trig-syntax-minimal-whitespace-01.trig
index f53451f8..f53451f8 100644
--- a/test/TriGTests/trig-syntax-minimal-whitespace-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-minimal-whitespace-01.trig
diff --git a/test/TriGTests/trig-syntax-ns-dots.trig b/test/w3c/TriGTests/trig-syntax-ns-dots.trig
index 7526a125..7526a125 100644
--- a/test/TriGTests/trig-syntax-ns-dots.trig
+++ b/test/w3c/TriGTests/trig-syntax-ns-dots.trig
diff --git a/test/TriGTests/trig-syntax-number-01.trig b/test/w3c/TriGTests/trig-syntax-number-01.trig
index 45d9b177..45d9b177 100644
--- a/test/TriGTests/trig-syntax-number-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-01.trig
diff --git a/test/TriGTests/trig-syntax-number-02.trig b/test/w3c/TriGTests/trig-syntax-number-02.trig
index 6cbb9b49..6cbb9b49 100644
--- a/test/TriGTests/trig-syntax-number-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-02.trig
diff --git a/test/TriGTests/trig-syntax-number-03.trig b/test/w3c/TriGTests/trig-syntax-number-03.trig
index 69021b45..69021b45 100644
--- a/test/TriGTests/trig-syntax-number-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-03.trig
diff --git a/test/TriGTests/trig-syntax-number-04.trig b/test/w3c/TriGTests/trig-syntax-number-04.trig
index f826907c..f826907c 100644
--- a/test/TriGTests/trig-syntax-number-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-04.trig
diff --git a/test/TriGTests/trig-syntax-number-05.trig b/test/w3c/TriGTests/trig-syntax-number-05.trig
index 72d44600..72d44600 100644
--- a/test/TriGTests/trig-syntax-number-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-05.trig
diff --git a/test/TriGTests/trig-syntax-number-06.trig b/test/w3c/TriGTests/trig-syntax-number-06.trig
index adcbffd8..adcbffd8 100644
--- a/test/TriGTests/trig-syntax-number-06.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-06.trig
diff --git a/test/TriGTests/trig-syntax-number-07.trig b/test/w3c/TriGTests/trig-syntax-number-07.trig
index a4802735..a4802735 100644
--- a/test/TriGTests/trig-syntax-number-07.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-07.trig
diff --git a/test/TriGTests/trig-syntax-number-08.trig b/test/w3c/TriGTests/trig-syntax-number-08.trig
index b0093500..b0093500 100644
--- a/test/TriGTests/trig-syntax-number-08.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-08.trig
diff --git a/test/TriGTests/trig-syntax-number-09.trig b/test/w3c/TriGTests/trig-syntax-number-09.trig
index 157456d2..157456d2 100644
--- a/test/TriGTests/trig-syntax-number-09.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-09.trig
diff --git a/test/TriGTests/trig-syntax-number-10.trig b/test/w3c/TriGTests/trig-syntax-number-10.trig
index 1426fda6..1426fda6 100644
--- a/test/TriGTests/trig-syntax-number-10.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-10.trig
diff --git a/test/TriGTests/trig-syntax-number-11.trig b/test/w3c/TriGTests/trig-syntax-number-11.trig
index 6ec517dd..6ec517dd 100644
--- a/test/TriGTests/trig-syntax-number-11.trig
+++ b/test/w3c/TriGTests/trig-syntax-number-11.trig
diff --git a/test/TriGTests/trig-syntax-pname-esc-01.trig b/test/w3c/TriGTests/trig-syntax-pname-esc-01.trig
index 4c7dd31d..4c7dd31d 100644
--- a/test/TriGTests/trig-syntax-pname-esc-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-pname-esc-01.trig
diff --git a/test/TriGTests/trig-syntax-pname-esc-02.trig b/test/w3c/TriGTests/trig-syntax-pname-esc-02.trig
index 2e6bd389..2e6bd389 100644
--- a/test/TriGTests/trig-syntax-pname-esc-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-pname-esc-02.trig
diff --git a/test/TriGTests/trig-syntax-pname-esc-03.trig b/test/w3c/TriGTests/trig-syntax-pname-esc-03.trig
index 433b9955..433b9955 100644
--- a/test/TriGTests/trig-syntax-pname-esc-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-pname-esc-03.trig
diff --git a/test/TriGTests/trig-syntax-prefix-01.trig b/test/w3c/TriGTests/trig-syntax-prefix-01.trig
index 89e08cc7..89e08cc7 100644
--- a/test/TriGTests/trig-syntax-prefix-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-prefix-01.trig
diff --git a/test/TriGTests/trig-syntax-prefix-02.trig b/test/w3c/TriGTests/trig-syntax-prefix-02.trig
index 5869e8bd..5869e8bd 100644
--- a/test/TriGTests/trig-syntax-prefix-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-prefix-02.trig
diff --git a/test/TriGTests/trig-syntax-prefix-03.trig b/test/w3c/TriGTests/trig-syntax-prefix-03.trig
index beb18c03..beb18c03 100644
--- a/test/TriGTests/trig-syntax-prefix-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-prefix-03.trig
diff --git a/test/TriGTests/trig-syntax-prefix-04.trig b/test/w3c/TriGTests/trig-syntax-prefix-04.trig
index 682cf0ae..682cf0ae 100644
--- a/test/TriGTests/trig-syntax-prefix-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-prefix-04.trig
diff --git a/test/TriGTests/trig-syntax-prefix-05.trig b/test/w3c/TriGTests/trig-syntax-prefix-05.trig
index 7c463e7c..7c463e7c 100644
--- a/test/TriGTests/trig-syntax-prefix-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-prefix-05.trig
diff --git a/test/TriGTests/trig-syntax-prefix-06.trig b/test/w3c/TriGTests/trig-syntax-prefix-06.trig
index b7a71c9a..b7a71c9a 100644
--- a/test/TriGTests/trig-syntax-prefix-06.trig
+++ b/test/w3c/TriGTests/trig-syntax-prefix-06.trig
diff --git a/test/TriGTests/trig-syntax-prefix-07.trig b/test/w3c/TriGTests/trig-syntax-prefix-07.trig
index 3337f3eb..3337f3eb 100644
--- a/test/TriGTests/trig-syntax-prefix-07.trig
+++ b/test/w3c/TriGTests/trig-syntax-prefix-07.trig
diff --git a/test/TriGTests/trig-syntax-prefix-08.trig b/test/w3c/TriGTests/trig-syntax-prefix-08.trig
index 669573aa..669573aa 100644
--- a/test/TriGTests/trig-syntax-prefix-08.trig
+++ b/test/w3c/TriGTests/trig-syntax-prefix-08.trig
diff --git a/test/TriGTests/trig-syntax-prefix-09.trig b/test/w3c/TriGTests/trig-syntax-prefix-09.trig
index ba50306c..ba50306c 100644
--- a/test/TriGTests/trig-syntax-prefix-09.trig
+++ b/test/w3c/TriGTests/trig-syntax-prefix-09.trig
diff --git a/test/TriGTests/trig-syntax-str-esc-01.trig b/test/w3c/TriGTests/trig-syntax-str-esc-01.trig
index 5db8be67..5db8be67 100644
--- a/test/TriGTests/trig-syntax-str-esc-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-str-esc-01.trig
diff --git a/test/TriGTests/trig-syntax-str-esc-02.trig b/test/w3c/TriGTests/trig-syntax-str-esc-02.trig
index 57cbdd6d..57cbdd6d 100644
--- a/test/TriGTests/trig-syntax-str-esc-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-str-esc-02.trig
diff --git a/test/TriGTests/trig-syntax-str-esc-03.trig b/test/w3c/TriGTests/trig-syntax-str-esc-03.trig
index 55f9b26f..55f9b26f 100644
--- a/test/TriGTests/trig-syntax-str-esc-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-str-esc-03.trig
diff --git a/test/TriGTests/trig-syntax-string-01.trig b/test/w3c/TriGTests/trig-syntax-string-01.trig
index 72230b7f..72230b7f 100644
--- a/test/TriGTests/trig-syntax-string-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-01.trig
diff --git a/test/TriGTests/trig-syntax-string-02.trig b/test/w3c/TriGTests/trig-syntax-string-02.trig
index a9ca8697..a9ca8697 100644
--- a/test/TriGTests/trig-syntax-string-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-02.trig
diff --git a/test/TriGTests/trig-syntax-string-03.trig b/test/w3c/TriGTests/trig-syntax-string-03.trig
index 9dc53ef6..9dc53ef6 100644
--- a/test/TriGTests/trig-syntax-string-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-03.trig
diff --git a/test/TriGTests/trig-syntax-string-04.trig b/test/w3c/TriGTests/trig-syntax-string-04.trig
index d5859b22..d5859b22 100644
--- a/test/TriGTests/trig-syntax-string-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-04.trig
diff --git a/test/TriGTests/trig-syntax-string-05.trig b/test/w3c/TriGTests/trig-syntax-string-05.trig
index 10292cca..10292cca 100644
--- a/test/TriGTests/trig-syntax-string-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-05.trig
diff --git a/test/TriGTests/trig-syntax-string-06.trig b/test/w3c/TriGTests/trig-syntax-string-06.trig
index 2ab1e863..2ab1e863 100644
--- a/test/TriGTests/trig-syntax-string-06.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-06.trig
diff --git a/test/TriGTests/trig-syntax-string-07.trig b/test/w3c/TriGTests/trig-syntax-string-07.trig
index 98edec55..98edec55 100644
--- a/test/TriGTests/trig-syntax-string-07.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-07.trig
diff --git a/test/TriGTests/trig-syntax-string-08.trig b/test/w3c/TriGTests/trig-syntax-string-08.trig
index 3612dec1..3612dec1 100644
--- a/test/TriGTests/trig-syntax-string-08.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-08.trig
diff --git a/test/TriGTests/trig-syntax-string-09.trig b/test/w3c/TriGTests/trig-syntax-string-09.trig
index 5d98aea6..5d98aea6 100644
--- a/test/TriGTests/trig-syntax-string-09.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-09.trig
diff --git a/test/TriGTests/trig-syntax-string-10.trig b/test/w3c/TriGTests/trig-syntax-string-10.trig
index f6112a2e..f6112a2e 100644
--- a/test/TriGTests/trig-syntax-string-10.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-10.trig
diff --git a/test/TriGTests/trig-syntax-string-11.trig b/test/w3c/TriGTests/trig-syntax-string-11.trig
index 450dc549..450dc549 100644
--- a/test/TriGTests/trig-syntax-string-11.trig
+++ b/test/w3c/TriGTests/trig-syntax-string-11.trig
diff --git a/test/TriGTests/trig-syntax-struct-01.trig b/test/w3c/TriGTests/trig-syntax-struct-01.trig
index 52c26c1c..52c26c1c 100644
--- a/test/TriGTests/trig-syntax-struct-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-struct-01.trig
diff --git a/test/TriGTests/trig-syntax-struct-02.trig b/test/w3c/TriGTests/trig-syntax-struct-02.trig
index 24535fad..24535fad 100644
--- a/test/TriGTests/trig-syntax-struct-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-struct-02.trig
diff --git a/test/TriGTests/trig-syntax-struct-03.trig b/test/w3c/TriGTests/trig-syntax-struct-03.trig
index 43d81074..43d81074 100644
--- a/test/TriGTests/trig-syntax-struct-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-struct-03.trig
diff --git a/test/TriGTests/trig-syntax-struct-04.trig b/test/w3c/TriGTests/trig-syntax-struct-04.trig
index 5a80fdf7..5a80fdf7 100644
--- a/test/TriGTests/trig-syntax-struct-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-struct-04.trig
diff --git a/test/TriGTests/trig-syntax-struct-05.trig b/test/w3c/TriGTests/trig-syntax-struct-05.trig
index 3a756523..3a756523 100644
--- a/test/TriGTests/trig-syntax-struct-05.trig
+++ b/test/w3c/TriGTests/trig-syntax-struct-05.trig
diff --git a/test/TriGTests/trig-syntax-struct-06.trig b/test/w3c/TriGTests/trig-syntax-struct-06.trig
index 81a5135c..81a5135c 100644
--- a/test/TriGTests/trig-syntax-struct-06.trig
+++ b/test/w3c/TriGTests/trig-syntax-struct-06.trig
diff --git a/test/TriGTests/trig-syntax-struct-07.trig b/test/w3c/TriGTests/trig-syntax-struct-07.trig
index 45f09d34..45f09d34 100644
--- a/test/TriGTests/trig-syntax-struct-07.trig
+++ b/test/w3c/TriGTests/trig-syntax-struct-07.trig
diff --git a/test/TriGTests/trig-syntax-uri-01.trig b/test/w3c/TriGTests/trig-syntax-uri-01.trig
index 2f634298..2f634298 100644
--- a/test/TriGTests/trig-syntax-uri-01.trig
+++ b/test/w3c/TriGTests/trig-syntax-uri-01.trig
diff --git a/test/TriGTests/trig-syntax-uri-02.trig b/test/w3c/TriGTests/trig-syntax-uri-02.trig
index 2276868e..2276868e 100644
--- a/test/TriGTests/trig-syntax-uri-02.trig
+++ b/test/w3c/TriGTests/trig-syntax-uri-02.trig
diff --git a/test/TriGTests/trig-syntax-uri-03.trig b/test/w3c/TriGTests/trig-syntax-uri-03.trig
index 6467687a..6467687a 100644
--- a/test/TriGTests/trig-syntax-uri-03.trig
+++ b/test/w3c/TriGTests/trig-syntax-uri-03.trig
diff --git a/test/TriGTests/trig-syntax-uri-04.trig b/test/w3c/TriGTests/trig-syntax-uri-04.trig
index d4a6ed29..d4a6ed29 100644
--- a/test/TriGTests/trig-syntax-uri-04.trig
+++ b/test/w3c/TriGTests/trig-syntax-uri-04.trig
diff --git a/test/TriGTests/trig-turtle-01.trig b/test/w3c/TriGTests/trig-turtle-01.trig
index 785f04cb..785f04cb 100644
--- a/test/TriGTests/trig-turtle-01.trig
+++ b/test/w3c/TriGTests/trig-turtle-01.trig
diff --git a/test/TriGTests/trig-turtle-02.trig b/test/w3c/TriGTests/trig-turtle-02.trig
index 4dd160b6..4dd160b6 100644
--- a/test/TriGTests/trig-turtle-02.trig
+++ b/test/w3c/TriGTests/trig-turtle-02.trig
diff --git a/test/TriGTests/trig-turtle-03.trig b/test/w3c/TriGTests/trig-turtle-03.trig
index b58574d1..b58574d1 100644
--- a/test/TriGTests/trig-turtle-03.trig
+++ b/test/w3c/TriGTests/trig-turtle-03.trig
diff --git a/test/TriGTests/trig-turtle-04.trig b/test/w3c/TriGTests/trig-turtle-04.trig
index 50ed5133..50ed5133 100644
--- a/test/TriGTests/trig-turtle-04.trig
+++ b/test/w3c/TriGTests/trig-turtle-04.trig
diff --git a/test/TriGTests/trig-turtle-05.trig b/test/w3c/TriGTests/trig-turtle-05.trig
index 06aaf659..06aaf659 100644
--- a/test/TriGTests/trig-turtle-05.trig
+++ b/test/w3c/TriGTests/trig-turtle-05.trig
diff --git a/test/TriGTests/trig-turtle-06.trig b/test/w3c/TriGTests/trig-turtle-06.trig
index b69fddeb..b69fddeb 100644
--- a/test/TriGTests/trig-turtle-06.trig
+++ b/test/w3c/TriGTests/trig-turtle-06.trig
diff --git a/test/TriGTests/trig-turtle-bad-01.trig b/test/w3c/TriGTests/trig-turtle-bad-01.trig
index 1bad23f5..1bad23f5 100644
--- a/test/TriGTests/trig-turtle-bad-01.trig
+++ b/test/w3c/TriGTests/trig-turtle-bad-01.trig
diff --git a/test/TriGTests/trig-turtle-bad-02.trig b/test/w3c/TriGTests/trig-turtle-bad-02.trig
index f46fc1c5..f46fc1c5 100644
--- a/test/TriGTests/trig-turtle-bad-02.trig
+++ b/test/w3c/TriGTests/trig-turtle-bad-02.trig
diff --git a/test/TriGTests/two_LITERAL_LONG2s.nq b/test/w3c/TriGTests/two_LITERAL_LONG2s.nq
index af94fe6a..af94fe6a 100644
--- a/test/TriGTests/two_LITERAL_LONG2s.nq
+++ b/test/w3c/TriGTests/two_LITERAL_LONG2s.nq
diff --git a/test/TriGTests/two_LITERAL_LONG2s.trig b/test/w3c/TriGTests/two_LITERAL_LONG2s.trig
index 93aea524..93aea524 100644
--- a/test/TriGTests/two_LITERAL_LONG2s.trig
+++ b/test/w3c/TriGTests/two_LITERAL_LONG2s.trig
diff --git a/test/TriGTests/underscore_in_localName.nq b/test/w3c/TriGTests/underscore_in_localName.nq
index f9d0c4f1..f9d0c4f1 100644
--- a/test/TriGTests/underscore_in_localName.nq
+++ b/test/w3c/TriGTests/underscore_in_localName.nq
diff --git a/test/TriGTests/underscore_in_localName.trig b/test/w3c/TriGTests/underscore_in_localName.trig
index e10726bd..e10726bd 100644
--- a/test/TriGTests/underscore_in_localName.trig
+++ b/test/w3c/TriGTests/underscore_in_localName.trig
diff --git a/test/TurtleTests/HYPHEN_MINUS_in_localName.nt b/test/w3c/TurtleTests/HYPHEN_MINUS_in_localName.nt
index 25546b38..25546b38 100644
--- a/test/TurtleTests/HYPHEN_MINUS_in_localName.nt
+++ b/test/w3c/TurtleTests/HYPHEN_MINUS_in_localName.nt
diff --git a/test/TurtleTests/HYPHEN_MINUS_in_localName.ttl b/test/w3c/TurtleTests/HYPHEN_MINUS_in_localName.ttl
index 0340b8c8..0340b8c8 100644
--- a/test/TurtleTests/HYPHEN_MINUS_in_localName.ttl
+++ b/test/w3c/TurtleTests/HYPHEN_MINUS_in_localName.ttl
diff --git a/test/TurtleTests/IRIREF_datatype.nt b/test/w3c/TurtleTests/IRIREF_datatype.nt
index c333a5f6..c333a5f6 100644
--- a/test/TurtleTests/IRIREF_datatype.nt
+++ b/test/w3c/TurtleTests/IRIREF_datatype.nt
diff --git a/test/TurtleTests/IRIREF_datatype.ttl b/test/w3c/TurtleTests/IRIREF_datatype.ttl
index c333a5f6..c333a5f6 100644
--- a/test/TurtleTests/IRIREF_datatype.ttl
+++ b/test/w3c/TurtleTests/IRIREF_datatype.ttl
diff --git a/test/TurtleTests/IRI_spo.nt b/test/w3c/TurtleTests/IRI_spo.nt
index 01125e50..01125e50 100644
--- a/test/TurtleTests/IRI_spo.nt
+++ b/test/w3c/TurtleTests/IRI_spo.nt
diff --git a/test/TurtleTests/IRI_subject.ttl b/test/w3c/TurtleTests/IRI_subject.ttl
index 01125e50..01125e50 100644
--- a/test/TurtleTests/IRI_subject.ttl
+++ b/test/w3c/TurtleTests/IRI_subject.ttl
diff --git a/test/TurtleTests/IRI_with_all_punctuation.nt b/test/w3c/TurtleTests/IRI_with_all_punctuation.nt
index 94158773..94158773 100644
--- a/test/TurtleTests/IRI_with_all_punctuation.nt
+++ b/test/w3c/TurtleTests/IRI_with_all_punctuation.nt
diff --git a/test/TurtleTests/IRI_with_all_punctuation.ttl b/test/w3c/TurtleTests/IRI_with_all_punctuation.ttl
index 94158773..94158773 100644
--- a/test/TurtleTests/IRI_with_all_punctuation.ttl
+++ b/test/w3c/TurtleTests/IRI_with_all_punctuation.ttl
diff --git a/test/TurtleTests/IRI_with_eight_digit_numeric_escape.ttl b/test/w3c/TurtleTests/IRI_with_eight_digit_numeric_escape.ttl
index 434034e7..434034e7 100644
--- a/test/TurtleTests/IRI_with_eight_digit_numeric_escape.ttl
+++ b/test/w3c/TurtleTests/IRI_with_eight_digit_numeric_escape.ttl
diff --git a/test/TurtleTests/IRI_with_four_digit_numeric_escape.ttl b/test/w3c/TurtleTests/IRI_with_four_digit_numeric_escape.ttl
index 4163636e..4163636e 100644
--- a/test/TurtleTests/IRI_with_four_digit_numeric_escape.ttl
+++ b/test/w3c/TurtleTests/IRI_with_four_digit_numeric_escape.ttl
diff --git a/test/TurtleTests/LICENSE b/test/w3c/TurtleTests/LICENSE
index 1ac8f4e1..1ac8f4e1 100644
--- a/test/TurtleTests/LICENSE
+++ b/test/w3c/TurtleTests/LICENSE
diff --git a/test/TurtleTests/LITERAL1.nt b/test/w3c/TurtleTests/LITERAL1.nt
index 3aba89e4..3aba89e4 100644
--- a/test/TurtleTests/LITERAL1.nt
+++ b/test/w3c/TurtleTests/LITERAL1.nt
diff --git a/test/TurtleTests/LITERAL1.ttl b/test/w3c/TurtleTests/LITERAL1.ttl
index 725a2403..725a2403 100644
--- a/test/TurtleTests/LITERAL1.ttl
+++ b/test/w3c/TurtleTests/LITERAL1.ttl
diff --git a/test/TurtleTests/LITERAL1_all_controls.nt b/test/w3c/TurtleTests/LITERAL1_all_controls.nt
index 91c8af14..91c8af14 100644
--- a/test/TurtleTests/LITERAL1_all_controls.nt
+++ b/test/w3c/TurtleTests/LITERAL1_all_controls.nt
diff --git a/test/TurtleTests/LITERAL1_all_controls.ttl b/test/w3c/TurtleTests/LITERAL1_all_controls.ttl
index dbf3721c..dbf3721c 100644
--- a/test/TurtleTests/LITERAL1_all_controls.ttl
+++ b/test/w3c/TurtleTests/LITERAL1_all_controls.ttl
diff --git a/test/TurtleTests/LITERAL1_all_punctuation.nt b/test/w3c/TurtleTests/LITERAL1_all_punctuation.nt
index c25d818f..c25d818f 100644
--- a/test/TurtleTests/LITERAL1_all_punctuation.nt
+++ b/test/w3c/TurtleTests/LITERAL1_all_punctuation.nt
diff --git a/test/TurtleTests/LITERAL1_all_punctuation.ttl b/test/w3c/TurtleTests/LITERAL1_all_punctuation.ttl
index 7b1d9e54..7b1d9e54 100644
--- a/test/TurtleTests/LITERAL1_all_punctuation.ttl
+++ b/test/w3c/TurtleTests/LITERAL1_all_punctuation.ttl
diff --git a/test/TurtleTests/LITERAL1_ascii_boundaries.nt b/test/w3c/TurtleTests/LITERAL1_ascii_boundaries.nt
index 69c41447..69c41447 100644
--- a/test/TurtleTests/LITERAL1_ascii_boundaries.nt
+++ b/test/w3c/TurtleTests/LITERAL1_ascii_boundaries.nt
diff --git a/test/TurtleTests/LITERAL1_ascii_boundaries.ttl b/test/w3c/TurtleTests/LITERAL1_ascii_boundaries.ttl
index 7d65396f..7d65396f 100644
--- a/test/TurtleTests/LITERAL1_ascii_boundaries.ttl
+++ b/test/w3c/TurtleTests/LITERAL1_ascii_boundaries.ttl
diff --git a/test/TurtleTests/LITERAL1_with_UTF8_boundaries.ttl b/test/w3c/TurtleTests/LITERAL1_with_UTF8_boundaries.ttl
index b72eb040..b72eb040 100644
--- a/test/TurtleTests/LITERAL1_with_UTF8_boundaries.ttl
+++ b/test/w3c/TurtleTests/LITERAL1_with_UTF8_boundaries.ttl
diff --git a/test/TurtleTests/LITERAL2.ttl b/test/w3c/TurtleTests/LITERAL2.ttl
index 3aba89e4..3aba89e4 100644
--- a/test/TurtleTests/LITERAL2.ttl
+++ b/test/w3c/TurtleTests/LITERAL2.ttl
diff --git a/test/TurtleTests/LITERAL2_ascii_boundaries.nt b/test/w3c/TurtleTests/LITERAL2_ascii_boundaries.nt
index 270a51e3..270a51e3 100644
--- a/test/TurtleTests/LITERAL2_ascii_boundaries.nt
+++ b/test/w3c/TurtleTests/LITERAL2_ascii_boundaries.nt
diff --git a/test/TurtleTests/LITERAL2_ascii_boundaries.ttl b/test/w3c/TurtleTests/LITERAL2_ascii_boundaries.ttl
index 90b4cd69..90b4cd69 100644
--- a/test/TurtleTests/LITERAL2_ascii_boundaries.ttl
+++ b/test/w3c/TurtleTests/LITERAL2_ascii_boundaries.ttl
diff --git a/test/TurtleTests/LITERAL2_with_UTF8_boundaries.ttl b/test/w3c/TurtleTests/LITERAL2_with_UTF8_boundaries.ttl
index 0e1616db..0e1616db 100644
--- a/test/TurtleTests/LITERAL2_with_UTF8_boundaries.ttl
+++ b/test/w3c/TurtleTests/LITERAL2_with_UTF8_boundaries.ttl
diff --git a/test/TurtleTests/LITERAL_LONG1.ttl b/test/w3c/TurtleTests/LITERAL_LONG1.ttl
index ab6baa93..ab6baa93 100644
--- a/test/TurtleTests/LITERAL_LONG1.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG1.ttl
diff --git a/test/TurtleTests/LITERAL_LONG1_ascii_boundaries.nt b/test/w3c/TurtleTests/LITERAL_LONG1_ascii_boundaries.nt
index a592b4a1..a592b4a1 100644
--- a/test/TurtleTests/LITERAL_LONG1_ascii_boundaries.nt
+++ b/test/w3c/TurtleTests/LITERAL_LONG1_ascii_boundaries.nt
diff --git a/test/TurtleTests/LITERAL_LONG1_ascii_boundaries.ttl b/test/w3c/TurtleTests/LITERAL_LONG1_ascii_boundaries.ttl
index f943e249..f943e249 100644
--- a/test/TurtleTests/LITERAL_LONG1_ascii_boundaries.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG1_ascii_boundaries.ttl
diff --git a/test/TurtleTests/LITERAL_LONG1_with_1_squote.nt b/test/w3c/TurtleTests/LITERAL_LONG1_with_1_squote.nt
index acf7f58f..acf7f58f 100644
--- a/test/TurtleTests/LITERAL_LONG1_with_1_squote.nt
+++ b/test/w3c/TurtleTests/LITERAL_LONG1_with_1_squote.nt
diff --git a/test/TurtleTests/LITERAL_LONG1_with_1_squote.ttl b/test/w3c/TurtleTests/LITERAL_LONG1_with_1_squote.ttl
index 3b93046b..3b93046b 100644
--- a/test/TurtleTests/LITERAL_LONG1_with_1_squote.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG1_with_1_squote.ttl
diff --git a/test/TurtleTests/LITERAL_LONG1_with_2_squotes.nt b/test/w3c/TurtleTests/LITERAL_LONG1_with_2_squotes.nt
index 8ddc52e8..8ddc52e8 100644
--- a/test/TurtleTests/LITERAL_LONG1_with_2_squotes.nt
+++ b/test/w3c/TurtleTests/LITERAL_LONG1_with_2_squotes.nt
diff --git a/test/TurtleTests/LITERAL_LONG1_with_2_squotes.ttl b/test/w3c/TurtleTests/LITERAL_LONG1_with_2_squotes.ttl
index 1219bad3..1219bad3 100644
--- a/test/TurtleTests/LITERAL_LONG1_with_2_squotes.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG1_with_2_squotes.ttl
diff --git a/test/TurtleTests/LITERAL_LONG1_with_UTF8_boundaries.ttl b/test/w3c/TurtleTests/LITERAL_LONG1_with_UTF8_boundaries.ttl
index e04b675e..e04b675e 100644
--- a/test/TurtleTests/LITERAL_LONG1_with_UTF8_boundaries.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG1_with_UTF8_boundaries.ttl
diff --git a/test/TurtleTests/LITERAL_LONG2.ttl b/test/w3c/TurtleTests/LITERAL_LONG2.ttl
index e37bf4a3..e37bf4a3 100644
--- a/test/TurtleTests/LITERAL_LONG2.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG2.ttl
diff --git a/test/TurtleTests/LITERAL_LONG2_ascii_boundaries.nt b/test/w3c/TurtleTests/LITERAL_LONG2_ascii_boundaries.nt
index 28785039..28785039 100644
--- a/test/TurtleTests/LITERAL_LONG2_ascii_boundaries.nt
+++ b/test/w3c/TurtleTests/LITERAL_LONG2_ascii_boundaries.nt
diff --git a/test/TurtleTests/LITERAL_LONG2_ascii_boundaries.ttl b/test/w3c/TurtleTests/LITERAL_LONG2_ascii_boundaries.ttl
index e919865f..e919865f 100644
--- a/test/TurtleTests/LITERAL_LONG2_ascii_boundaries.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG2_ascii_boundaries.ttl
diff --git a/test/TurtleTests/LITERAL_LONG2_with_1_squote.nt b/test/w3c/TurtleTests/LITERAL_LONG2_with_1_squote.nt
index 05a1fd3a..05a1fd3a 100644
--- a/test/TurtleTests/LITERAL_LONG2_with_1_squote.nt
+++ b/test/w3c/TurtleTests/LITERAL_LONG2_with_1_squote.nt
diff --git a/test/TurtleTests/LITERAL_LONG2_with_1_squote.ttl b/test/w3c/TurtleTests/LITERAL_LONG2_with_1_squote.ttl
index 80e389b8..80e389b8 100644
--- a/test/TurtleTests/LITERAL_LONG2_with_1_squote.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG2_with_1_squote.ttl
diff --git a/test/TurtleTests/LITERAL_LONG2_with_2_squotes.nt b/test/w3c/TurtleTests/LITERAL_LONG2_with_2_squotes.nt
index 3e69dc10..3e69dc10 100644
--- a/test/TurtleTests/LITERAL_LONG2_with_2_squotes.nt
+++ b/test/w3c/TurtleTests/LITERAL_LONG2_with_2_squotes.nt
diff --git a/test/TurtleTests/LITERAL_LONG2_with_2_squotes.ttl b/test/w3c/TurtleTests/LITERAL_LONG2_with_2_squotes.ttl
index 2f14f5b3..2f14f5b3 100644
--- a/test/TurtleTests/LITERAL_LONG2_with_2_squotes.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG2_with_2_squotes.ttl
diff --git a/test/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nt b/test/w3c/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nt
index 586e364d..586e364d 100644
--- a/test/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nt
+++ b/test/w3c/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.nt
diff --git a/test/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.ttl b/test/w3c/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.ttl
index 2206e33b..2206e33b 100644
--- a/test/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG2_with_REVERSE_SOLIDUS.ttl
diff --git a/test/TurtleTests/LITERAL_LONG2_with_UTF8_boundaries.ttl b/test/w3c/TurtleTests/LITERAL_LONG2_with_UTF8_boundaries.ttl
index 644b32d8..644b32d8 100644
--- a/test/TurtleTests/LITERAL_LONG2_with_UTF8_boundaries.ttl
+++ b/test/w3c/TurtleTests/LITERAL_LONG2_with_UTF8_boundaries.ttl
diff --git a/test/TurtleTests/LITERAL_with_UTF8_boundaries.nt b/test/w3c/TurtleTests/LITERAL_with_UTF8_boundaries.nt
index 47a2527a..47a2527a 100644
--- a/test/TurtleTests/LITERAL_with_UTF8_boundaries.nt
+++ b/test/w3c/TurtleTests/LITERAL_with_UTF8_boundaries.nt
diff --git a/test/TurtleTests/README b/test/w3c/TurtleTests/README
index 1b049b9c..1b049b9c 100644
--- a/test/TurtleTests/README
+++ b/test/w3c/TurtleTests/README
diff --git a/test/TurtleTests/SPARQL_style_base.ttl b/test/w3c/TurtleTests/SPARQL_style_base.ttl
index d134ea81..d134ea81 100644
--- a/test/TurtleTests/SPARQL_style_base.ttl
+++ b/test/w3c/TurtleTests/SPARQL_style_base.ttl
diff --git a/test/TurtleTests/SPARQL_style_prefix.ttl b/test/w3c/TurtleTests/SPARQL_style_prefix.ttl
index e7e4a3da..e7e4a3da 100644
--- a/test/TurtleTests/SPARQL_style_prefix.ttl
+++ b/test/w3c/TurtleTests/SPARQL_style_prefix.ttl
diff --git a/test/TurtleTests/anonymous_blank_node_object.nt b/test/w3c/TurtleTests/anonymous_blank_node_object.nt
index 89e88f63..89e88f63 100644
--- a/test/TurtleTests/anonymous_blank_node_object.nt
+++ b/test/w3c/TurtleTests/anonymous_blank_node_object.nt
diff --git a/test/TurtleTests/anonymous_blank_node_object.ttl b/test/w3c/TurtleTests/anonymous_blank_node_object.ttl
index 0b2ce436..0b2ce436 100644
--- a/test/TurtleTests/anonymous_blank_node_object.ttl
+++ b/test/w3c/TurtleTests/anonymous_blank_node_object.ttl
diff --git a/test/TurtleTests/anonymous_blank_node_subject.nt b/test/w3c/TurtleTests/anonymous_blank_node_subject.nt
index b48df9a7..b48df9a7 100644
--- a/test/TurtleTests/anonymous_blank_node_subject.nt
+++ b/test/w3c/TurtleTests/anonymous_blank_node_subject.nt
diff --git a/test/TurtleTests/anonymous_blank_node_subject.ttl b/test/w3c/TurtleTests/anonymous_blank_node_subject.ttl
index 17b378c2..17b378c2 100644
--- a/test/TurtleTests/anonymous_blank_node_subject.ttl
+++ b/test/w3c/TurtleTests/anonymous_blank_node_subject.ttl
diff --git a/test/TurtleTests/bareword_a_predicate.nt b/test/w3c/TurtleTests/bareword_a_predicate.nt
index afe14252..afe14252 100644
--- a/test/TurtleTests/bareword_a_predicate.nt
+++ b/test/w3c/TurtleTests/bareword_a_predicate.nt
diff --git a/test/TurtleTests/bareword_a_predicate.ttl b/test/w3c/TurtleTests/bareword_a_predicate.ttl
index 66fa0d0c..66fa0d0c 100644
--- a/test/TurtleTests/bareword_a_predicate.ttl
+++ b/test/w3c/TurtleTests/bareword_a_predicate.ttl
diff --git a/test/TurtleTests/bareword_decimal.nt b/test/w3c/TurtleTests/bareword_decimal.nt
index e177a9c6..e177a9c6 100644
--- a/test/TurtleTests/bareword_decimal.nt
+++ b/test/w3c/TurtleTests/bareword_decimal.nt
diff --git a/test/TurtleTests/bareword_decimal.ttl b/test/w3c/TurtleTests/bareword_decimal.ttl
index 20955d51..20955d51 100644
--- a/test/TurtleTests/bareword_decimal.ttl
+++ b/test/w3c/TurtleTests/bareword_decimal.ttl
diff --git a/test/TurtleTests/bareword_double.nt b/test/w3c/TurtleTests/bareword_double.nt
index dd8be2fd..dd8be2fd 100644
--- a/test/TurtleTests/bareword_double.nt
+++ b/test/w3c/TurtleTests/bareword_double.nt
diff --git a/test/TurtleTests/bareword_double.ttl b/test/w3c/TurtleTests/bareword_double.ttl
index 7ce25b11..7ce25b11 100644
--- a/test/TurtleTests/bareword_double.ttl
+++ b/test/w3c/TurtleTests/bareword_double.ttl
diff --git a/test/TurtleTests/bareword_integer.ttl b/test/w3c/TurtleTests/bareword_integer.ttl
index 087e71b6..087e71b6 100644
--- a/test/TurtleTests/bareword_integer.ttl
+++ b/test/w3c/TurtleTests/bareword_integer.ttl
diff --git a/test/TurtleTests/blankNodePropertyList_as_object.nt b/test/w3c/TurtleTests/blankNodePropertyList_as_object.nt
index 528bd844..528bd844 100644
--- a/test/TurtleTests/blankNodePropertyList_as_object.nt
+++ b/test/w3c/TurtleTests/blankNodePropertyList_as_object.nt
diff --git a/test/TurtleTests/blankNodePropertyList_as_object.ttl b/test/w3c/TurtleTests/blankNodePropertyList_as_object.ttl
index aa85a746..aa85a746 100644
--- a/test/TurtleTests/blankNodePropertyList_as_object.ttl
+++ b/test/w3c/TurtleTests/blankNodePropertyList_as_object.ttl
diff --git a/test/TurtleTests/blankNodePropertyList_as_subject.nt b/test/w3c/TurtleTests/blankNodePropertyList_as_subject.nt
index f0768879..f0768879 100644
--- a/test/TurtleTests/blankNodePropertyList_as_subject.nt
+++ b/test/w3c/TurtleTests/blankNodePropertyList_as_subject.nt
diff --git a/test/TurtleTests/blankNodePropertyList_as_subject.ttl b/test/w3c/TurtleTests/blankNodePropertyList_as_subject.ttl
index cb2e52aa..cb2e52aa 100644
--- a/test/TurtleTests/blankNodePropertyList_as_subject.ttl
+++ b/test/w3c/TurtleTests/blankNodePropertyList_as_subject.ttl
diff --git a/test/TurtleTests/blankNodePropertyList_containing_collection.nt b/test/w3c/TurtleTests/blankNodePropertyList_containing_collection.nt
index e590826b..e590826b 100644
--- a/test/TurtleTests/blankNodePropertyList_containing_collection.nt
+++ b/test/w3c/TurtleTests/blankNodePropertyList_containing_collection.nt
diff --git a/test/TurtleTests/blankNodePropertyList_containing_collection.ttl b/test/w3c/TurtleTests/blankNodePropertyList_containing_collection.ttl
index bf164c83..bf164c83 100644
--- a/test/TurtleTests/blankNodePropertyList_containing_collection.ttl
+++ b/test/w3c/TurtleTests/blankNodePropertyList_containing_collection.ttl
diff --git a/test/TurtleTests/blankNodePropertyList_with_multiple_triples.nt b/test/w3c/TurtleTests/blankNodePropertyList_with_multiple_triples.nt
index 8f3fc507..8f3fc507 100644
--- a/test/TurtleTests/blankNodePropertyList_with_multiple_triples.nt
+++ b/test/w3c/TurtleTests/blankNodePropertyList_with_multiple_triples.nt
diff --git a/test/TurtleTests/blankNodePropertyList_with_multiple_triples.ttl b/test/w3c/TurtleTests/blankNodePropertyList_with_multiple_triples.ttl
index 6153c13d..6153c13d 100644
--- a/test/TurtleTests/blankNodePropertyList_with_multiple_triples.ttl
+++ b/test/w3c/TurtleTests/blankNodePropertyList_with_multiple_triples.ttl
diff --git a/test/TurtleTests/collection_object.nt b/test/w3c/TurtleTests/collection_object.nt
index 391162e0..391162e0 100644
--- a/test/TurtleTests/collection_object.nt
+++ b/test/w3c/TurtleTests/collection_object.nt
diff --git a/test/TurtleTests/collection_object.ttl b/test/w3c/TurtleTests/collection_object.ttl
index 6af34715..6af34715 100644
--- a/test/TurtleTests/collection_object.ttl
+++ b/test/w3c/TurtleTests/collection_object.ttl
diff --git a/test/TurtleTests/collection_subject.nt b/test/w3c/TurtleTests/collection_subject.nt
index 502768c8..502768c8 100644
--- a/test/TurtleTests/collection_subject.nt
+++ b/test/w3c/TurtleTests/collection_subject.nt
diff --git a/test/TurtleTests/collection_subject.ttl b/test/w3c/TurtleTests/collection_subject.ttl
index 00a4c0bc..00a4c0bc 100644
--- a/test/TurtleTests/collection_subject.ttl
+++ b/test/w3c/TurtleTests/collection_subject.ttl
diff --git a/test/TurtleTests/comment_following_PNAME_NS.nt b/test/w3c/TurtleTests/comment_following_PNAME_NS.nt
index a8ca81c5..a8ca81c5 100644
--- a/test/TurtleTests/comment_following_PNAME_NS.nt
+++ b/test/w3c/TurtleTests/comment_following_PNAME_NS.nt
diff --git a/test/TurtleTests/comment_following_PNAME_NS.ttl b/test/w3c/TurtleTests/comment_following_PNAME_NS.ttl
index c03124c4..c03124c4 100644
--- a/test/TurtleTests/comment_following_PNAME_NS.ttl
+++ b/test/w3c/TurtleTests/comment_following_PNAME_NS.ttl
diff --git a/test/TurtleTests/comment_following_localName.ttl b/test/w3c/TurtleTests/comment_following_localName.ttl
index 919f876b..919f876b 100644
--- a/test/TurtleTests/comment_following_localName.ttl
+++ b/test/w3c/TurtleTests/comment_following_localName.ttl
diff --git a/test/TurtleTests/default_namespace_IRI.ttl b/test/w3c/TurtleTests/default_namespace_IRI.ttl
index f1f83fd5..f1f83fd5 100644
--- a/test/TurtleTests/default_namespace_IRI.ttl
+++ b/test/w3c/TurtleTests/default_namespace_IRI.ttl
diff --git a/test/TurtleTests/double_lower_case_e.nt b/test/w3c/TurtleTests/double_lower_case_e.nt
index 49a792b9..49a792b9 100644
--- a/test/TurtleTests/double_lower_case_e.nt
+++ b/test/w3c/TurtleTests/double_lower_case_e.nt
diff --git a/test/TurtleTests/double_lower_case_e.ttl b/test/w3c/TurtleTests/double_lower_case_e.ttl
index 5f4552bf..5f4552bf 100644
--- a/test/TurtleTests/double_lower_case_e.ttl
+++ b/test/w3c/TurtleTests/double_lower_case_e.ttl
diff --git a/test/TurtleTests/empty_collection.nt b/test/w3c/TurtleTests/empty_collection.nt
index 82726a3f..82726a3f 100644
--- a/test/TurtleTests/empty_collection.nt
+++ b/test/w3c/TurtleTests/empty_collection.nt
diff --git a/test/TurtleTests/empty_collection.ttl b/test/w3c/TurtleTests/empty_collection.ttl
index 02f9cc07..02f9cc07 100644
--- a/test/TurtleTests/empty_collection.ttl
+++ b/test/w3c/TurtleTests/empty_collection.ttl
diff --git a/test/TurtleTests/first.nt b/test/w3c/TurtleTests/first.nt
index d50539f6..d50539f6 100644
--- a/test/TurtleTests/first.nt
+++ b/test/w3c/TurtleTests/first.nt
diff --git a/test/TurtleTests/first.ttl b/test/w3c/TurtleTests/first.ttl
index 44f496cb..44f496cb 100644
--- a/test/TurtleTests/first.ttl
+++ b/test/w3c/TurtleTests/first.ttl
diff --git a/test/TurtleTests/labeled_blank_node_object.nt b/test/w3c/TurtleTests/labeled_blank_node_object.nt
index 2645d4ee..2645d4ee 100644
--- a/test/TurtleTests/labeled_blank_node_object.nt
+++ b/test/w3c/TurtleTests/labeled_blank_node_object.nt
diff --git a/test/TurtleTests/labeled_blank_node_object.ttl b/test/w3c/TurtleTests/labeled_blank_node_object.ttl
index 2645d4ee..2645d4ee 100644
--- a/test/TurtleTests/labeled_blank_node_object.ttl
+++ b/test/w3c/TurtleTests/labeled_blank_node_object.ttl
diff --git a/test/TurtleTests/labeled_blank_node_subject.nt b/test/w3c/TurtleTests/labeled_blank_node_subject.nt
index d0c7f458..d0c7f458 100644
--- a/test/TurtleTests/labeled_blank_node_subject.nt
+++ b/test/w3c/TurtleTests/labeled_blank_node_subject.nt
diff --git a/test/TurtleTests/labeled_blank_node_subject.ttl b/test/w3c/TurtleTests/labeled_blank_node_subject.ttl
index d0c7f458..d0c7f458 100644
--- a/test/TurtleTests/labeled_blank_node_subject.ttl
+++ b/test/w3c/TurtleTests/labeled_blank_node_subject.ttl
diff --git a/test/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nt b/test/w3c/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nt
index 50be8d6f..50be8d6f 100644
--- a/test/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nt
+++ b/test/w3c/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.nt
diff --git a/test/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl b/test/w3c/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
index 50be8d6f..50be8d6f 100644
--- a/test/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/w3c/TurtleTests/labeled_blank_node_with_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/test/TurtleTests/labeled_blank_node_with_leading_digit.nt b/test/w3c/TurtleTests/labeled_blank_node_with_leading_digit.nt
index 7244d806..7244d806 100644
--- a/test/TurtleTests/labeled_blank_node_with_leading_digit.nt
+++ b/test/w3c/TurtleTests/labeled_blank_node_with_leading_digit.nt
diff --git a/test/TurtleTests/labeled_blank_node_with_leading_digit.ttl b/test/w3c/TurtleTests/labeled_blank_node_with_leading_digit.ttl
index 7244d806..7244d806 100644
--- a/test/TurtleTests/labeled_blank_node_with_leading_digit.ttl
+++ b/test/w3c/TurtleTests/labeled_blank_node_with_leading_digit.ttl
diff --git a/test/TurtleTests/labeled_blank_node_with_leading_underscore.nt b/test/w3c/TurtleTests/labeled_blank_node_with_leading_underscore.nt
index 15d9ffc8..15d9ffc8 100644
--- a/test/TurtleTests/labeled_blank_node_with_leading_underscore.nt
+++ b/test/w3c/TurtleTests/labeled_blank_node_with_leading_underscore.nt
diff --git a/test/TurtleTests/labeled_blank_node_with_leading_underscore.ttl b/test/w3c/TurtleTests/labeled_blank_node_with_leading_underscore.ttl
index 15d9ffc8..15d9ffc8 100644
--- a/test/TurtleTests/labeled_blank_node_with_leading_underscore.ttl
+++ b/test/w3c/TurtleTests/labeled_blank_node_with_leading_underscore.ttl
diff --git a/test/TurtleTests/labeled_blank_node_with_non_leading_extras.nt b/test/w3c/TurtleTests/labeled_blank_node_with_non_leading_extras.nt
index 5ae09b7c..5ae09b7c 100644
--- a/test/TurtleTests/labeled_blank_node_with_non_leading_extras.nt
+++ b/test/w3c/TurtleTests/labeled_blank_node_with_non_leading_extras.nt
diff --git a/test/TurtleTests/labeled_blank_node_with_non_leading_extras.ttl b/test/w3c/TurtleTests/labeled_blank_node_with_non_leading_extras.ttl
index 5ae09b7c..5ae09b7c 100644
--- a/test/TurtleTests/labeled_blank_node_with_non_leading_extras.ttl
+++ b/test/w3c/TurtleTests/labeled_blank_node_with_non_leading_extras.ttl
diff --git a/test/TurtleTests/langtagged_LONG.ttl b/test/w3c/TurtleTests/langtagged_LONG.ttl
index 2baefe5d..2baefe5d 100644
--- a/test/TurtleTests/langtagged_LONG.ttl
+++ b/test/w3c/TurtleTests/langtagged_LONG.ttl
diff --git a/test/TurtleTests/langtagged_LONG_with_subtag.nt b/test/w3c/TurtleTests/langtagged_LONG_with_subtag.nt
index 629cbf42..629cbf42 100644
--- a/test/TurtleTests/langtagged_LONG_with_subtag.nt
+++ b/test/w3c/TurtleTests/langtagged_LONG_with_subtag.nt
diff --git a/test/TurtleTests/langtagged_LONG_with_subtag.ttl b/test/w3c/TurtleTests/langtagged_LONG_with_subtag.ttl
index 7fd527c4..7fd527c4 100644
--- a/test/TurtleTests/langtagged_LONG_with_subtag.ttl
+++ b/test/w3c/TurtleTests/langtagged_LONG_with_subtag.ttl
diff --git a/test/TurtleTests/langtagged_non_LONG.nt b/test/w3c/TurtleTests/langtagged_non_LONG.nt
index 1bddb04e..1bddb04e 100644
--- a/test/TurtleTests/langtagged_non_LONG.nt
+++ b/test/w3c/TurtleTests/langtagged_non_LONG.nt
diff --git a/test/TurtleTests/langtagged_non_LONG.ttl b/test/w3c/TurtleTests/langtagged_non_LONG.ttl
index 1bddb04e..1bddb04e 100644
--- a/test/TurtleTests/langtagged_non_LONG.ttl
+++ b/test/w3c/TurtleTests/langtagged_non_LONG.ttl
diff --git a/test/TurtleTests/lantag_with_subtag.nt b/test/w3c/TurtleTests/lantag_with_subtag.nt
index 46c9d53a..46c9d53a 100644
--- a/test/TurtleTests/lantag_with_subtag.nt
+++ b/test/w3c/TurtleTests/lantag_with_subtag.nt
diff --git a/test/TurtleTests/lantag_with_subtag.ttl b/test/w3c/TurtleTests/lantag_with_subtag.ttl
index 46c9d53a..46c9d53a 100644
--- a/test/TurtleTests/lantag_with_subtag.ttl
+++ b/test/w3c/TurtleTests/lantag_with_subtag.ttl
diff --git a/test/TurtleTests/last.nt b/test/w3c/TurtleTests/last.nt
index 27c21b3d..27c21b3d 100644
--- a/test/TurtleTests/last.nt
+++ b/test/w3c/TurtleTests/last.nt
diff --git a/test/TurtleTests/last.ttl b/test/w3c/TurtleTests/last.ttl
index 1254c261..1254c261 100644
--- a/test/TurtleTests/last.ttl
+++ b/test/w3c/TurtleTests/last.ttl
diff --git a/test/TurtleTests/literal_false.nt b/test/w3c/TurtleTests/literal_false.nt
index 5bbbae84..5bbbae84 100644
--- a/test/TurtleTests/literal_false.nt
+++ b/test/w3c/TurtleTests/literal_false.nt
diff --git a/test/TurtleTests/literal_false.ttl b/test/w3c/TurtleTests/literal_false.ttl
index 6a32e362..6a32e362 100644
--- a/test/TurtleTests/literal_false.ttl
+++ b/test/w3c/TurtleTests/literal_false.ttl
diff --git a/test/TurtleTests/literal_true.nt b/test/w3c/TurtleTests/literal_true.nt
index 054b229f..054b229f 100644
--- a/test/TurtleTests/literal_true.nt
+++ b/test/w3c/TurtleTests/literal_true.nt
diff --git a/test/TurtleTests/literal_true.ttl b/test/w3c/TurtleTests/literal_true.ttl
index 6c5bb742..6c5bb742 100644
--- a/test/TurtleTests/literal_true.ttl
+++ b/test/w3c/TurtleTests/literal_true.ttl
diff --git a/test/TurtleTests/literal_with_BACKSPACE.nt b/test/w3c/TurtleTests/literal_with_BACKSPACE.nt
index 7dba113b..7dba113b 100644
--- a/test/TurtleTests/literal_with_BACKSPACE.nt
+++ b/test/w3c/TurtleTests/literal_with_BACKSPACE.nt
diff --git a/test/TurtleTests/literal_with_BACKSPACE.ttl b/test/w3c/TurtleTests/literal_with_BACKSPACE.ttl
index 17b2880f..17b2880f 100644
--- a/test/TurtleTests/literal_with_BACKSPACE.ttl
+++ b/test/w3c/TurtleTests/literal_with_BACKSPACE.ttl
diff --git a/test/TurtleTests/literal_with_CARRIAGE_RETURN.nt b/test/w3c/TurtleTests/literal_with_CARRIAGE_RETURN.nt
index 91b85c89..91b85c89 100644
--- a/test/TurtleTests/literal_with_CARRIAGE_RETURN.nt
+++ b/test/w3c/TurtleTests/literal_with_CARRIAGE_RETURN.nt
diff --git a/test/TurtleTests/literal_with_CARRIAGE_RETURN.ttl b/test/w3c/TurtleTests/literal_with_CARRIAGE_RETURN.ttl
index 3cd1d89c..3cd1d89c 100644
--- a/test/TurtleTests/literal_with_CARRIAGE_RETURN.ttl
+++ b/test/w3c/TurtleTests/literal_with_CARRIAGE_RETURN.ttl
diff --git a/test/TurtleTests/literal_with_CHARACTER_TABULATION.nt b/test/w3c/TurtleTests/literal_with_CHARACTER_TABULATION.nt
index a6a9d9f0..a6a9d9f0 100644
--- a/test/TurtleTests/literal_with_CHARACTER_TABULATION.nt
+++ b/test/w3c/TurtleTests/literal_with_CHARACTER_TABULATION.nt
diff --git a/test/TurtleTests/literal_with_CHARACTER_TABULATION.ttl b/test/w3c/TurtleTests/literal_with_CHARACTER_TABULATION.ttl
index 37fbd9d1..37fbd9d1 100644
--- a/test/TurtleTests/literal_with_CHARACTER_TABULATION.ttl
+++ b/test/w3c/TurtleTests/literal_with_CHARACTER_TABULATION.ttl
diff --git a/test/TurtleTests/literal_with_FORM_FEED.nt b/test/w3c/TurtleTests/literal_with_FORM_FEED.nt
index 2a4490b3..2a4490b3 100644
--- a/test/TurtleTests/literal_with_FORM_FEED.nt
+++ b/test/w3c/TurtleTests/literal_with_FORM_FEED.nt
diff --git a/test/TurtleTests/literal_with_FORM_FEED.ttl b/test/w3c/TurtleTests/literal_with_FORM_FEED.ttl
index 76d6ee77..76d6ee77 100644
--- a/test/TurtleTests/literal_with_FORM_FEED.ttl
+++ b/test/w3c/TurtleTests/literal_with_FORM_FEED.ttl
diff --git a/test/TurtleTests/literal_with_LINE_FEED.nt b/test/w3c/TurtleTests/literal_with_LINE_FEED.nt
index 462f97ac..462f97ac 100644
--- a/test/TurtleTests/literal_with_LINE_FEED.nt
+++ b/test/w3c/TurtleTests/literal_with_LINE_FEED.nt
diff --git a/test/TurtleTests/literal_with_LINE_FEED.ttl b/test/w3c/TurtleTests/literal_with_LINE_FEED.ttl
index 50cc8a8b..50cc8a8b 100644
--- a/test/TurtleTests/literal_with_LINE_FEED.ttl
+++ b/test/w3c/TurtleTests/literal_with_LINE_FEED.ttl
diff --git a/test/TurtleTests/literal_with_REVERSE_SOLIDUS.nt b/test/w3c/TurtleTests/literal_with_REVERSE_SOLIDUS.nt
index ebc846ed..ebc846ed 100644
--- a/test/TurtleTests/literal_with_REVERSE_SOLIDUS.nt
+++ b/test/w3c/TurtleTests/literal_with_REVERSE_SOLIDUS.nt
diff --git a/test/TurtleTests/literal_with_REVERSE_SOLIDUS.ttl b/test/w3c/TurtleTests/literal_with_REVERSE_SOLIDUS.ttl
index 380a3d04..380a3d04 100644
--- a/test/TurtleTests/literal_with_REVERSE_SOLIDUS.ttl
+++ b/test/w3c/TurtleTests/literal_with_REVERSE_SOLIDUS.ttl
diff --git a/test/TurtleTests/literal_with_escaped_BACKSPACE.ttl b/test/w3c/TurtleTests/literal_with_escaped_BACKSPACE.ttl
index 5284b9b6..5284b9b6 100644
--- a/test/TurtleTests/literal_with_escaped_BACKSPACE.ttl
+++ b/test/w3c/TurtleTests/literal_with_escaped_BACKSPACE.ttl
diff --git a/test/TurtleTests/literal_with_escaped_CARRIAGE_RETURN.ttl b/test/w3c/TurtleTests/literal_with_escaped_CARRIAGE_RETURN.ttl
index a28e7c0b..a28e7c0b 100644
--- a/test/TurtleTests/literal_with_escaped_CARRIAGE_RETURN.ttl
+++ b/test/w3c/TurtleTests/literal_with_escaped_CARRIAGE_RETURN.ttl
diff --git a/test/TurtleTests/literal_with_escaped_CHARACTER_TABULATION.ttl b/test/w3c/TurtleTests/literal_with_escaped_CHARACTER_TABULATION.ttl
index 67966f78..67966f78 100644
--- a/test/TurtleTests/literal_with_escaped_CHARACTER_TABULATION.ttl
+++ b/test/w3c/TurtleTests/literal_with_escaped_CHARACTER_TABULATION.ttl
diff --git a/test/TurtleTests/literal_with_escaped_FORM_FEED.ttl b/test/w3c/TurtleTests/literal_with_escaped_FORM_FEED.ttl
index 21acace9..21acace9 100644
--- a/test/TurtleTests/literal_with_escaped_FORM_FEED.ttl
+++ b/test/w3c/TurtleTests/literal_with_escaped_FORM_FEED.ttl
diff --git a/test/TurtleTests/literal_with_escaped_LINE_FEED.ttl b/test/w3c/TurtleTests/literal_with_escaped_LINE_FEED.ttl
index b53f49ec..b53f49ec 100644
--- a/test/TurtleTests/literal_with_escaped_LINE_FEED.ttl
+++ b/test/w3c/TurtleTests/literal_with_escaped_LINE_FEED.ttl
diff --git a/test/TurtleTests/literal_with_numeric_escape4.nt b/test/w3c/TurtleTests/literal_with_numeric_escape4.nt
index 0b35a89a..0b35a89a 100644
--- a/test/TurtleTests/literal_with_numeric_escape4.nt
+++ b/test/w3c/TurtleTests/literal_with_numeric_escape4.nt
diff --git a/test/TurtleTests/literal_with_numeric_escape4.ttl b/test/w3c/TurtleTests/literal_with_numeric_escape4.ttl
index 2b4e0175..2b4e0175 100644
--- a/test/TurtleTests/literal_with_numeric_escape4.ttl
+++ b/test/w3c/TurtleTests/literal_with_numeric_escape4.ttl
diff --git a/test/TurtleTests/literal_with_numeric_escape8.ttl b/test/w3c/TurtleTests/literal_with_numeric_escape8.ttl
index 8d0e4ef2..8d0e4ef2 100644
--- a/test/TurtleTests/literal_with_numeric_escape8.ttl
+++ b/test/w3c/TurtleTests/literal_with_numeric_escape8.ttl
diff --git a/test/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt b/test/w3c/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
index 4b60c9e1..4b60c9e1 100644
--- a/test/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
+++ b/test/w3c/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nt
diff --git a/test/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.ttl b/test/w3c/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.ttl
index c532e3d0..c532e3d0 100644
--- a/test/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/w3c/TurtleTests/localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/test/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt b/test/w3c/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
index 78ef1086..78ef1086 100644
--- a/test/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
+++ b/test/w3c/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nt
diff --git a/test/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.ttl b/test/w3c/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.ttl
index 15b23dd8..15b23dd8 100644
--- a/test/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/w3c/TurtleTests/localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/test/TurtleTests/localName_with_leading_digit.nt b/test/w3c/TurtleTests/localName_with_leading_digit.nt
index a9e101e5..a9e101e5 100644
--- a/test/TurtleTests/localName_with_leading_digit.nt
+++ b/test/w3c/TurtleTests/localName_with_leading_digit.nt
diff --git a/test/TurtleTests/localName_with_leading_digit.ttl b/test/w3c/TurtleTests/localName_with_leading_digit.ttl
index 65da2499..65da2499 100644
--- a/test/TurtleTests/localName_with_leading_digit.ttl
+++ b/test/w3c/TurtleTests/localName_with_leading_digit.ttl
diff --git a/test/TurtleTests/localName_with_leading_underscore.nt b/test/w3c/TurtleTests/localName_with_leading_underscore.nt
index e042a7b9..e042a7b9 100644
--- a/test/TurtleTests/localName_with_leading_underscore.nt
+++ b/test/w3c/TurtleTests/localName_with_leading_underscore.nt
diff --git a/test/TurtleTests/localName_with_leading_underscore.ttl b/test/w3c/TurtleTests/localName_with_leading_underscore.ttl
index 762ace98..762ace98 100644
--- a/test/TurtleTests/localName_with_leading_underscore.ttl
+++ b/test/w3c/TurtleTests/localName_with_leading_underscore.ttl
diff --git a/test/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt b/test/w3c/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
index 5b346919..5b346919 100644
--- a/test/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
+++ b/test/w3c/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.nt
diff --git a/test/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.ttl b/test/w3c/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.ttl
index 0922d95d..0922d95d 100644
--- a/test/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/w3c/TurtleTests/localName_with_nfc_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/test/TurtleTests/localName_with_non_leading_extras.nt b/test/w3c/TurtleTests/localName_with_non_leading_extras.nt
index 749b98cd..749b98cd 100644
--- a/test/TurtleTests/localName_with_non_leading_extras.nt
+++ b/test/w3c/TurtleTests/localName_with_non_leading_extras.nt
diff --git a/test/TurtleTests/localName_with_non_leading_extras.ttl b/test/w3c/TurtleTests/localName_with_non_leading_extras.ttl
index db25a8a6..db25a8a6 100644
--- a/test/TurtleTests/localName_with_non_leading_extras.ttl
+++ b/test/w3c/TurtleTests/localName_with_non_leading_extras.ttl
diff --git a/test/TurtleTests/localname_with_COLON.nt b/test/w3c/TurtleTests/localname_with_COLON.nt
index eb966ca3..eb966ca3 100644
--- a/test/TurtleTests/localname_with_COLON.nt
+++ b/test/w3c/TurtleTests/localname_with_COLON.nt
diff --git a/test/TurtleTests/localname_with_COLON.ttl b/test/w3c/TurtleTests/localname_with_COLON.ttl
index 1d45f20f..1d45f20f 100644
--- a/test/TurtleTests/localname_with_COLON.ttl
+++ b/test/w3c/TurtleTests/localname_with_COLON.ttl
diff --git a/test/TurtleTests/manifest.ttl b/test/w3c/TurtleTests/manifest.ttl
index 0a24655e..0a24655e 100644
--- a/test/TurtleTests/manifest.ttl
+++ b/test/w3c/TurtleTests/manifest.ttl
diff --git a/test/TurtleTests/negative_numeric.nt b/test/w3c/TurtleTests/negative_numeric.nt
index 4baf628d..4baf628d 100644
--- a/test/TurtleTests/negative_numeric.nt
+++ b/test/w3c/TurtleTests/negative_numeric.nt
diff --git a/test/TurtleTests/negative_numeric.ttl b/test/w3c/TurtleTests/negative_numeric.ttl
index a6a7f57b..a6a7f57b 100644
--- a/test/TurtleTests/negative_numeric.ttl
+++ b/test/w3c/TurtleTests/negative_numeric.ttl
diff --git a/test/TurtleTests/nested_blankNodePropertyLists.nt b/test/w3c/TurtleTests/nested_blankNodePropertyLists.nt
index 5284c007..5284c007 100644
--- a/test/TurtleTests/nested_blankNodePropertyLists.nt
+++ b/test/w3c/TurtleTests/nested_blankNodePropertyLists.nt
diff --git a/test/TurtleTests/nested_blankNodePropertyLists.ttl b/test/w3c/TurtleTests/nested_blankNodePropertyLists.ttl
index a3e4681c..a3e4681c 100644
--- a/test/TurtleTests/nested_blankNodePropertyLists.ttl
+++ b/test/w3c/TurtleTests/nested_blankNodePropertyLists.ttl
diff --git a/test/TurtleTests/nested_collection.nt b/test/w3c/TurtleTests/nested_collection.nt
index eaea2847..eaea2847 100644
--- a/test/TurtleTests/nested_collection.nt
+++ b/test/w3c/TurtleTests/nested_collection.nt
diff --git a/test/TurtleTests/nested_collection.ttl b/test/w3c/TurtleTests/nested_collection.ttl
index 944e7c6b..944e7c6b 100644
--- a/test/TurtleTests/nested_collection.ttl
+++ b/test/w3c/TurtleTests/nested_collection.ttl
diff --git a/test/TurtleTests/number_sign_following_PNAME_NS.nt b/test/w3c/TurtleTests/number_sign_following_PNAME_NS.nt
index 82d9629a..82d9629a 100644
--- a/test/TurtleTests/number_sign_following_PNAME_NS.nt
+++ b/test/w3c/TurtleTests/number_sign_following_PNAME_NS.nt
diff --git a/test/TurtleTests/number_sign_following_PNAME_NS.ttl b/test/w3c/TurtleTests/number_sign_following_PNAME_NS.ttl
index 2003fa4d..2003fa4d 100644
--- a/test/TurtleTests/number_sign_following_PNAME_NS.ttl
+++ b/test/w3c/TurtleTests/number_sign_following_PNAME_NS.ttl
diff --git a/test/TurtleTests/number_sign_following_localName.nt b/test/w3c/TurtleTests/number_sign_following_localName.nt
index 5ae57b8d..5ae57b8d 100644
--- a/test/TurtleTests/number_sign_following_localName.nt
+++ b/test/w3c/TurtleTests/number_sign_following_localName.nt
diff --git a/test/TurtleTests/number_sign_following_localName.ttl b/test/w3c/TurtleTests/number_sign_following_localName.ttl
index a0e39ecd..a0e39ecd 100644
--- a/test/TurtleTests/number_sign_following_localName.ttl
+++ b/test/w3c/TurtleTests/number_sign_following_localName.ttl
diff --git a/test/TurtleTests/numeric_with_leading_0.nt b/test/w3c/TurtleTests/numeric_with_leading_0.nt
index 1df5c472..1df5c472 100644
--- a/test/TurtleTests/numeric_with_leading_0.nt
+++ b/test/w3c/TurtleTests/numeric_with_leading_0.nt
diff --git a/test/TurtleTests/numeric_with_leading_0.ttl b/test/w3c/TurtleTests/numeric_with_leading_0.ttl
index a5eac209..a5eac209 100644
--- a/test/TurtleTests/numeric_with_leading_0.ttl
+++ b/test/w3c/TurtleTests/numeric_with_leading_0.ttl
diff --git a/test/TurtleTests/objectList_with_two_objects.nt b/test/w3c/TurtleTests/objectList_with_two_objects.nt
index 7f8e9c0f..7f8e9c0f 100644
--- a/test/TurtleTests/objectList_with_two_objects.nt
+++ b/test/w3c/TurtleTests/objectList_with_two_objects.nt
diff --git a/test/TurtleTests/objectList_with_two_objects.ttl b/test/w3c/TurtleTests/objectList_with_two_objects.ttl
index b12f02d1..b12f02d1 100644
--- a/test/TurtleTests/objectList_with_two_objects.ttl
+++ b/test/w3c/TurtleTests/objectList_with_two_objects.ttl
diff --git a/test/TurtleTests/old_style_base.ttl b/test/w3c/TurtleTests/old_style_base.ttl
index f0f4c03c..f0f4c03c 100644
--- a/test/TurtleTests/old_style_base.ttl
+++ b/test/w3c/TurtleTests/old_style_base.ttl
diff --git a/test/TurtleTests/old_style_prefix.ttl b/test/w3c/TurtleTests/old_style_prefix.ttl
index 59595672..59595672 100644
--- a/test/TurtleTests/old_style_prefix.ttl
+++ b/test/w3c/TurtleTests/old_style_prefix.ttl
diff --git a/test/TurtleTests/percent_escaped_localName.nt b/test/w3c/TurtleTests/percent_escaped_localName.nt
index e0af4b62..e0af4b62 100644
--- a/test/TurtleTests/percent_escaped_localName.nt
+++ b/test/w3c/TurtleTests/percent_escaped_localName.nt
diff --git a/test/TurtleTests/percent_escaped_localName.ttl b/test/w3c/TurtleTests/percent_escaped_localName.ttl
index 0564ccab..0564ccab 100644
--- a/test/TurtleTests/percent_escaped_localName.ttl
+++ b/test/w3c/TurtleTests/percent_escaped_localName.ttl
diff --git a/test/TurtleTests/positive_numeric.nt b/test/w3c/TurtleTests/positive_numeric.nt
index 96e6086a..96e6086a 100644
--- a/test/TurtleTests/positive_numeric.nt
+++ b/test/w3c/TurtleTests/positive_numeric.nt
diff --git a/test/TurtleTests/positive_numeric.ttl b/test/w3c/TurtleTests/positive_numeric.ttl
index 606691d9..606691d9 100644
--- a/test/TurtleTests/positive_numeric.ttl
+++ b/test/w3c/TurtleTests/positive_numeric.ttl
diff --git a/test/TurtleTests/predicateObjectList_with_two_objectLists.nt b/test/w3c/TurtleTests/predicateObjectList_with_two_objectLists.nt
index 274182c7..274182c7 100644
--- a/test/TurtleTests/predicateObjectList_with_two_objectLists.nt
+++ b/test/w3c/TurtleTests/predicateObjectList_with_two_objectLists.nt
diff --git a/test/TurtleTests/predicateObjectList_with_two_objectLists.ttl b/test/w3c/TurtleTests/predicateObjectList_with_two_objectLists.ttl
index 337b132f..337b132f 100644
--- a/test/TurtleTests/predicateObjectList_with_two_objectLists.ttl
+++ b/test/w3c/TurtleTests/predicateObjectList_with_two_objectLists.ttl
diff --git a/test/TurtleTests/prefix_only_IRI.ttl b/test/w3c/TurtleTests/prefix_only_IRI.ttl
index 9ff66603..9ff66603 100644
--- a/test/TurtleTests/prefix_only_IRI.ttl
+++ b/test/w3c/TurtleTests/prefix_only_IRI.ttl
diff --git a/test/TurtleTests/prefix_reassigned_and_used.nt b/test/w3c/TurtleTests/prefix_reassigned_and_used.nt
index 68bc9efe..68bc9efe 100644
--- a/test/TurtleTests/prefix_reassigned_and_used.nt
+++ b/test/w3c/TurtleTests/prefix_reassigned_and_used.nt
diff --git a/test/TurtleTests/prefix_reassigned_and_used.ttl b/test/w3c/TurtleTests/prefix_reassigned_and_used.ttl
index 1f948597..1f948597 100644
--- a/test/TurtleTests/prefix_reassigned_and_used.ttl
+++ b/test/w3c/TurtleTests/prefix_reassigned_and_used.ttl
diff --git a/test/TurtleTests/prefix_with_PN_CHARS_BASE_character_boundaries.ttl b/test/w3c/TurtleTests/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
index bc436bd2..bc436bd2 100644
--- a/test/TurtleTests/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
+++ b/test/w3c/TurtleTests/prefix_with_PN_CHARS_BASE_character_boundaries.ttl
diff --git a/test/TurtleTests/prefix_with_non_leading_extras.ttl b/test/w3c/TurtleTests/prefix_with_non_leading_extras.ttl
index 193460a8..193460a8 100644
--- a/test/TurtleTests/prefix_with_non_leading_extras.ttl
+++ b/test/w3c/TurtleTests/prefix_with_non_leading_extras.ttl
diff --git a/test/TurtleTests/prefixed_IRI_object.ttl b/test/w3c/TurtleTests/prefixed_IRI_object.ttl
index c2d50362..c2d50362 100644
--- a/test/TurtleTests/prefixed_IRI_object.ttl
+++ b/test/w3c/TurtleTests/prefixed_IRI_object.ttl
diff --git a/test/TurtleTests/prefixed_IRI_predicate.ttl b/test/w3c/TurtleTests/prefixed_IRI_predicate.ttl
index 2c1e5cc7..2c1e5cc7 100644
--- a/test/TurtleTests/prefixed_IRI_predicate.ttl
+++ b/test/w3c/TurtleTests/prefixed_IRI_predicate.ttl
diff --git a/test/TurtleTests/prefixed_name_datatype.ttl b/test/w3c/TurtleTests/prefixed_name_datatype.ttl
index 4a526073..4a526073 100644
--- a/test/TurtleTests/prefixed_name_datatype.ttl
+++ b/test/w3c/TurtleTests/prefixed_name_datatype.ttl
diff --git a/test/TurtleTests/repeated_semis_at_end.ttl b/test/w3c/TurtleTests/repeated_semis_at_end.ttl
index 8a4d9356..8a4d9356 100644
--- a/test/TurtleTests/repeated_semis_at_end.ttl
+++ b/test/w3c/TurtleTests/repeated_semis_at_end.ttl
diff --git a/test/TurtleTests/repeated_semis_not_at_end.nt b/test/w3c/TurtleTests/repeated_semis_not_at_end.nt
index 9ac6005f..9ac6005f 100644
--- a/test/TurtleTests/repeated_semis_not_at_end.nt
+++ b/test/w3c/TurtleTests/repeated_semis_not_at_end.nt
diff --git a/test/TurtleTests/repeated_semis_not_at_end.ttl b/test/w3c/TurtleTests/repeated_semis_not_at_end.ttl
index 3c8144f3..3c8144f3 100644
--- a/test/TurtleTests/repeated_semis_not_at_end.ttl
+++ b/test/w3c/TurtleTests/repeated_semis_not_at_end.ttl
diff --git a/test/TurtleTests/reserved_escaped_localName.nt b/test/w3c/TurtleTests/reserved_escaped_localName.nt
index 1ee4f32e..1ee4f32e 100644
--- a/test/TurtleTests/reserved_escaped_localName.nt
+++ b/test/w3c/TurtleTests/reserved_escaped_localName.nt
diff --git a/test/TurtleTests/reserved_escaped_localName.ttl b/test/w3c/TurtleTests/reserved_escaped_localName.ttl
index ae97f8af..ae97f8af 100644
--- a/test/TurtleTests/reserved_escaped_localName.ttl
+++ b/test/w3c/TurtleTests/reserved_escaped_localName.ttl
diff --git a/test/TurtleTests/sole_blankNodePropertyList.nt b/test/w3c/TurtleTests/sole_blankNodePropertyList.nt
index b48df9a7..b48df9a7 100644
--- a/test/TurtleTests/sole_blankNodePropertyList.nt
+++ b/test/w3c/TurtleTests/sole_blankNodePropertyList.nt
diff --git a/test/TurtleTests/sole_blankNodePropertyList.ttl b/test/w3c/TurtleTests/sole_blankNodePropertyList.ttl
index 5cc300f3..5cc300f3 100644
--- a/test/TurtleTests/sole_blankNodePropertyList.ttl
+++ b/test/w3c/TurtleTests/sole_blankNodePropertyList.ttl
diff --git a/test/TurtleTests/turtle-eval-bad-01.ttl b/test/w3c/TurtleTests/turtle-eval-bad-01.ttl
index c9c458e8..c9c458e8 100644
--- a/test/TurtleTests/turtle-eval-bad-01.ttl
+++ b/test/w3c/TurtleTests/turtle-eval-bad-01.ttl
diff --git a/test/TurtleTests/turtle-eval-bad-02.ttl b/test/w3c/TurtleTests/turtle-eval-bad-02.ttl
index f2be6ea5..f2be6ea5 100644
--- a/test/TurtleTests/turtle-eval-bad-02.ttl
+++ b/test/w3c/TurtleTests/turtle-eval-bad-02.ttl
diff --git a/test/TurtleTests/turtle-eval-bad-03.ttl b/test/w3c/TurtleTests/turtle-eval-bad-03.ttl
index 1aec7ff9..1aec7ff9 100644
--- a/test/TurtleTests/turtle-eval-bad-03.ttl
+++ b/test/w3c/TurtleTests/turtle-eval-bad-03.ttl
diff --git a/test/TurtleTests/turtle-eval-bad-04.ttl b/test/w3c/TurtleTests/turtle-eval-bad-04.ttl
index 4b7601b3..4b7601b3 100644
--- a/test/TurtleTests/turtle-eval-bad-04.ttl
+++ b/test/w3c/TurtleTests/turtle-eval-bad-04.ttl
diff --git a/test/TurtleTests/turtle-eval-struct-01.nt b/test/w3c/TurtleTests/turtle-eval-struct-01.nt
index 2e2d5baf..2e2d5baf 100644
--- a/test/TurtleTests/turtle-eval-struct-01.nt
+++ b/test/w3c/TurtleTests/turtle-eval-struct-01.nt
diff --git a/test/TurtleTests/turtle-eval-struct-01.ttl b/test/w3c/TurtleTests/turtle-eval-struct-01.ttl
index 2e2d5baf..2e2d5baf 100644
--- a/test/TurtleTests/turtle-eval-struct-01.ttl
+++ b/test/w3c/TurtleTests/turtle-eval-struct-01.ttl
diff --git a/test/TurtleTests/turtle-eval-struct-02.nt b/test/w3c/TurtleTests/turtle-eval-struct-02.nt
index 6cdc856a..6cdc856a 100644
--- a/test/TurtleTests/turtle-eval-struct-02.nt
+++ b/test/w3c/TurtleTests/turtle-eval-struct-02.nt
diff --git a/test/TurtleTests/turtle-eval-struct-02.ttl b/test/w3c/TurtleTests/turtle-eval-struct-02.ttl
index 45b9ea05..45b9ea05 100644
--- a/test/TurtleTests/turtle-eval-struct-02.ttl
+++ b/test/w3c/TurtleTests/turtle-eval-struct-02.ttl
diff --git a/test/TurtleTests/turtle-subm-01.nt b/test/w3c/TurtleTests/turtle-subm-01.nt
index 9efa50de..9efa50de 100644
--- a/test/TurtleTests/turtle-subm-01.nt
+++ b/test/w3c/TurtleTests/turtle-subm-01.nt
diff --git a/test/TurtleTests/turtle-subm-01.ttl b/test/w3c/TurtleTests/turtle-subm-01.ttl
index 78da35e6..78da35e6 100644
--- a/test/TurtleTests/turtle-subm-01.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-01.ttl
diff --git a/test/TurtleTests/turtle-subm-02.nt b/test/w3c/TurtleTests/turtle-subm-02.nt
index 5ccb5bd2..5ccb5bd2 100644
--- a/test/TurtleTests/turtle-subm-02.nt
+++ b/test/w3c/TurtleTests/turtle-subm-02.nt
diff --git a/test/TurtleTests/turtle-subm-02.ttl b/test/w3c/TurtleTests/turtle-subm-02.ttl
index 9070d2c4..9070d2c4 100644
--- a/test/TurtleTests/turtle-subm-02.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-02.ttl
diff --git a/test/TurtleTests/turtle-subm-03.nt b/test/w3c/TurtleTests/turtle-subm-03.nt
index 99732ab3..99732ab3 100644
--- a/test/TurtleTests/turtle-subm-03.nt
+++ b/test/w3c/TurtleTests/turtle-subm-03.nt
diff --git a/test/TurtleTests/turtle-subm-03.ttl b/test/w3c/TurtleTests/turtle-subm-03.ttl
index a623f3c1..a623f3c1 100644
--- a/test/TurtleTests/turtle-subm-03.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-03.ttl
diff --git a/test/TurtleTests/turtle-subm-04.nt b/test/w3c/TurtleTests/turtle-subm-04.nt
index d6ce9e8f..d6ce9e8f 100644
--- a/test/TurtleTests/turtle-subm-04.nt
+++ b/test/w3c/TurtleTests/turtle-subm-04.nt
diff --git a/test/TurtleTests/turtle-subm-04.ttl b/test/w3c/TurtleTests/turtle-subm-04.ttl
index 9179fa50..9179fa50 100644
--- a/test/TurtleTests/turtle-subm-04.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-04.ttl
diff --git a/test/TurtleTests/turtle-subm-05.nt b/test/w3c/TurtleTests/turtle-subm-05.nt
index d5d01526..d5d01526 100644
--- a/test/TurtleTests/turtle-subm-05.nt
+++ b/test/w3c/TurtleTests/turtle-subm-05.nt
diff --git a/test/TurtleTests/turtle-subm-05.ttl b/test/w3c/TurtleTests/turtle-subm-05.ttl
index c5181479..c5181479 100644
--- a/test/TurtleTests/turtle-subm-05.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-05.ttl
diff --git a/test/TurtleTests/turtle-subm-06.nt b/test/w3c/TurtleTests/turtle-subm-06.nt
index d440197f..d440197f 100644
--- a/test/TurtleTests/turtle-subm-06.nt
+++ b/test/w3c/TurtleTests/turtle-subm-06.nt
diff --git a/test/TurtleTests/turtle-subm-06.ttl b/test/w3c/TurtleTests/turtle-subm-06.ttl
index adcbcabd..adcbcabd 100644
--- a/test/TurtleTests/turtle-subm-06.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-06.ttl
diff --git a/test/TurtleTests/turtle-subm-07.nt b/test/w3c/TurtleTests/turtle-subm-07.nt
index 49961ea6..49961ea6 100644
--- a/test/TurtleTests/turtle-subm-07.nt
+++ b/test/w3c/TurtleTests/turtle-subm-07.nt
diff --git a/test/TurtleTests/turtle-subm-07.ttl b/test/w3c/TurtleTests/turtle-subm-07.ttl
index 9c1005cc..9c1005cc 100644
--- a/test/TurtleTests/turtle-subm-07.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-07.ttl
diff --git a/test/TurtleTests/turtle-subm-08.nt b/test/w3c/TurtleTests/turtle-subm-08.nt
index e62cede5..e62cede5 100644
--- a/test/TurtleTests/turtle-subm-08.nt
+++ b/test/w3c/TurtleTests/turtle-subm-08.nt
diff --git a/test/TurtleTests/turtle-subm-08.ttl b/test/w3c/TurtleTests/turtle-subm-08.ttl
index 84559403..84559403 100644
--- a/test/TurtleTests/turtle-subm-08.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-08.ttl
diff --git a/test/TurtleTests/turtle-subm-09.nt b/test/w3c/TurtleTests/turtle-subm-09.nt
index a77939cd..a77939cd 100644
--- a/test/TurtleTests/turtle-subm-09.nt
+++ b/test/w3c/TurtleTests/turtle-subm-09.nt
diff --git a/test/TurtleTests/turtle-subm-09.ttl b/test/w3c/TurtleTests/turtle-subm-09.ttl
index adce0a20..adce0a20 100644
--- a/test/TurtleTests/turtle-subm-09.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-09.ttl
diff --git a/test/TurtleTests/turtle-subm-10.nt b/test/w3c/TurtleTests/turtle-subm-10.nt
index c7164085..c7164085 100644
--- a/test/TurtleTests/turtle-subm-10.nt
+++ b/test/w3c/TurtleTests/turtle-subm-10.nt
diff --git a/test/TurtleTests/turtle-subm-10.ttl b/test/w3c/TurtleTests/turtle-subm-10.ttl
index 0afe1b0a..0afe1b0a 100644
--- a/test/TurtleTests/turtle-subm-10.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-10.ttl
diff --git a/test/TurtleTests/turtle-subm-11.nt b/test/w3c/TurtleTests/turtle-subm-11.nt
index ff88aa6f..ff88aa6f 100644
--- a/test/TurtleTests/turtle-subm-11.nt
+++ b/test/w3c/TurtleTests/turtle-subm-11.nt
diff --git a/test/TurtleTests/turtle-subm-11.ttl b/test/w3c/TurtleTests/turtle-subm-11.ttl
index 5d36360e..5d36360e 100644
--- a/test/TurtleTests/turtle-subm-11.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-11.ttl
diff --git a/test/TurtleTests/turtle-subm-12.nt b/test/w3c/TurtleTests/turtle-subm-12.nt
index f936a5b6..f936a5b6 100644
--- a/test/TurtleTests/turtle-subm-12.nt
+++ b/test/w3c/TurtleTests/turtle-subm-12.nt
diff --git a/test/TurtleTests/turtle-subm-12.ttl b/test/w3c/TurtleTests/turtle-subm-12.ttl
index 3de1a43f..3de1a43f 100644
--- a/test/TurtleTests/turtle-subm-12.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-12.ttl
diff --git a/test/TurtleTests/turtle-subm-13.nt b/test/w3c/TurtleTests/turtle-subm-13.nt
index 67404a59..67404a59 100644
--- a/test/TurtleTests/turtle-subm-13.nt
+++ b/test/w3c/TurtleTests/turtle-subm-13.nt
diff --git a/test/TurtleTests/turtle-subm-13.ttl b/test/w3c/TurtleTests/turtle-subm-13.ttl
index 1fed9f5e..1fed9f5e 100644
--- a/test/TurtleTests/turtle-subm-13.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-13.ttl
diff --git a/test/TurtleTests/turtle-subm-14.nt b/test/w3c/TurtleTests/turtle-subm-14.nt
index 195a1af7..195a1af7 100644
--- a/test/TurtleTests/turtle-subm-14.nt
+++ b/test/w3c/TurtleTests/turtle-subm-14.nt
diff --git a/test/TurtleTests/turtle-subm-14.ttl b/test/w3c/TurtleTests/turtle-subm-14.ttl
index a8be95be..a8be95be 100644
--- a/test/TurtleTests/turtle-subm-14.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-14.ttl
diff --git a/test/TurtleTests/turtle-subm-15.nt b/test/w3c/TurtleTests/turtle-subm-15.nt
index 466edbb2..466edbb2 100644
--- a/test/TurtleTests/turtle-subm-15.nt
+++ b/test/w3c/TurtleTests/turtle-subm-15.nt
diff --git a/test/TurtleTests/turtle-subm-15.ttl b/test/w3c/TurtleTests/turtle-subm-15.ttl
index 86c453bd..86c453bd 100644
--- a/test/TurtleTests/turtle-subm-15.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-15.ttl
diff --git a/test/TurtleTests/turtle-subm-16.nt b/test/w3c/TurtleTests/turtle-subm-16.nt
index 7726bbfc..7726bbfc 100644
--- a/test/TurtleTests/turtle-subm-16.nt
+++ b/test/w3c/TurtleTests/turtle-subm-16.nt
diff --git a/test/TurtleTests/turtle-subm-16.ttl b/test/w3c/TurtleTests/turtle-subm-16.ttl
index f5482d4a..f5482d4a 100644
--- a/test/TurtleTests/turtle-subm-16.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-16.ttl
diff --git a/test/TurtleTests/turtle-subm-17.nt b/test/w3c/TurtleTests/turtle-subm-17.nt
index 2e2dbe40..2e2dbe40 100644
--- a/test/TurtleTests/turtle-subm-17.nt
+++ b/test/w3c/TurtleTests/turtle-subm-17.nt
diff --git a/test/TurtleTests/turtle-subm-17.ttl b/test/w3c/TurtleTests/turtle-subm-17.ttl
index 9de0c07b..9de0c07b 100644
--- a/test/TurtleTests/turtle-subm-17.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-17.ttl
diff --git a/test/TurtleTests/turtle-subm-18.nt b/test/w3c/TurtleTests/turtle-subm-18.nt
index fff2da56..fff2da56 100644
--- a/test/TurtleTests/turtle-subm-18.nt
+++ b/test/w3c/TurtleTests/turtle-subm-18.nt
diff --git a/test/TurtleTests/turtle-subm-18.ttl b/test/w3c/TurtleTests/turtle-subm-18.ttl
index 37a9a4f3..37a9a4f3 100644
--- a/test/TurtleTests/turtle-subm-18.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-18.ttl
diff --git a/test/TurtleTests/turtle-subm-19.nt b/test/w3c/TurtleTests/turtle-subm-19.nt
index d5dca690..d5dca690 100644
--- a/test/TurtleTests/turtle-subm-19.nt
+++ b/test/w3c/TurtleTests/turtle-subm-19.nt
diff --git a/test/TurtleTests/turtle-subm-19.ttl b/test/w3c/TurtleTests/turtle-subm-19.ttl
index a8e8dc15..a8e8dc15 100644
--- a/test/TurtleTests/turtle-subm-19.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-19.ttl
diff --git a/test/TurtleTests/turtle-subm-20.nt b/test/w3c/TurtleTests/turtle-subm-20.nt
index 3d0f970e..3d0f970e 100644
--- a/test/TurtleTests/turtle-subm-20.nt
+++ b/test/w3c/TurtleTests/turtle-subm-20.nt
diff --git a/test/TurtleTests/turtle-subm-20.ttl b/test/w3c/TurtleTests/turtle-subm-20.ttl
index 9b1a725a..9b1a725a 100644
--- a/test/TurtleTests/turtle-subm-20.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-20.ttl
diff --git a/test/TurtleTests/turtle-subm-21.nt b/test/w3c/TurtleTests/turtle-subm-21.nt
index fde31312..fde31312 100644
--- a/test/TurtleTests/turtle-subm-21.nt
+++ b/test/w3c/TurtleTests/turtle-subm-21.nt
diff --git a/test/TurtleTests/turtle-subm-21.ttl b/test/w3c/TurtleTests/turtle-subm-21.ttl
index 9f5360af..9f5360af 100644
--- a/test/TurtleTests/turtle-subm-21.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-21.ttl
diff --git a/test/TurtleTests/turtle-subm-22.nt b/test/w3c/TurtleTests/turtle-subm-22.nt
index 5a70bff1..5a70bff1 100644
--- a/test/TurtleTests/turtle-subm-22.nt
+++ b/test/w3c/TurtleTests/turtle-subm-22.nt
diff --git a/test/TurtleTests/turtle-subm-22.ttl b/test/w3c/TurtleTests/turtle-subm-22.ttl
index 25f3b757..25f3b757 100644
--- a/test/TurtleTests/turtle-subm-22.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-22.ttl
diff --git a/test/TurtleTests/turtle-subm-23.nt b/test/w3c/TurtleTests/turtle-subm-23.nt
index 1a38415f..1a38415f 100644
--- a/test/TurtleTests/turtle-subm-23.nt
+++ b/test/w3c/TurtleTests/turtle-subm-23.nt
diff --git a/test/TurtleTests/turtle-subm-23.ttl b/test/w3c/TurtleTests/turtle-subm-23.ttl
index 310349da..310349da 100644
--- a/test/TurtleTests/turtle-subm-23.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-23.ttl
diff --git a/test/TurtleTests/turtle-subm-24.nt b/test/w3c/TurtleTests/turtle-subm-24.nt
index ad105cf4..ad105cf4 100644
--- a/test/TurtleTests/turtle-subm-24.nt
+++ b/test/w3c/TurtleTests/turtle-subm-24.nt
diff --git a/test/TurtleTests/turtle-subm-24.ttl b/test/w3c/TurtleTests/turtle-subm-24.ttl
index 0667c6b4..0667c6b4 100644
--- a/test/TurtleTests/turtle-subm-24.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-24.ttl
diff --git a/test/TurtleTests/turtle-subm-25.nt b/test/w3c/TurtleTests/turtle-subm-25.nt
index 7da0635b..7da0635b 100644
--- a/test/TurtleTests/turtle-subm-25.nt
+++ b/test/w3c/TurtleTests/turtle-subm-25.nt
diff --git a/test/TurtleTests/turtle-subm-25.ttl b/test/w3c/TurtleTests/turtle-subm-25.ttl
index 569023c8..569023c8 100644
--- a/test/TurtleTests/turtle-subm-25.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-25.ttl
diff --git a/test/TurtleTests/turtle-subm-26.nt b/test/w3c/TurtleTests/turtle-subm-26.nt
index 7357dd40..7357dd40 100644
--- a/test/TurtleTests/turtle-subm-26.nt
+++ b/test/w3c/TurtleTests/turtle-subm-26.nt
diff --git a/test/TurtleTests/turtle-subm-26.ttl b/test/w3c/TurtleTests/turtle-subm-26.ttl
index 7357dd40..7357dd40 100644
--- a/test/TurtleTests/turtle-subm-26.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-26.ttl
diff --git a/test/TurtleTests/turtle-subm-27.nt b/test/w3c/TurtleTests/turtle-subm-27.nt
index f9ebfef1..f9ebfef1 100644
--- a/test/TurtleTests/turtle-subm-27.nt
+++ b/test/w3c/TurtleTests/turtle-subm-27.nt
diff --git a/test/TurtleTests/turtle-subm-27.ttl b/test/w3c/TurtleTests/turtle-subm-27.ttl
index ad39c024..ad39c024 100644
--- a/test/TurtleTests/turtle-subm-27.ttl
+++ b/test/w3c/TurtleTests/turtle-subm-27.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-LITERAL2_with_langtag_and_datatype.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-LITERAL2_with_langtag_and_datatype.ttl
index 56180417..56180417 100644
--- a/test/TurtleTests/turtle-syntax-bad-LITERAL2_with_langtag_and_datatype.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-LITERAL2_with_langtag_and_datatype.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-base-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-base-01.ttl
index 7b0412f8..7b0412f8 100644
--- a/test/TurtleTests/turtle-syntax-bad-base-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-base-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-base-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-base-02.ttl
index 8893b652..8893b652 100644
--- a/test/TurtleTests/turtle-syntax-bad-base-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-base-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-base-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-base-03.ttl
index 013f9f2b..013f9f2b 100644
--- a/test/TurtleTests/turtle-syntax-bad-base-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-base-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-blank-label-dot-end.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-blank-label-dot-end.ttl
index 58c0aa20..58c0aa20 100644
--- a/test/TurtleTests/turtle-syntax-bad-blank-label-dot-end.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-blank-label-dot-end.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-esc-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-esc-01.ttl
index 6daa1b58..6daa1b58 100644
--- a/test/TurtleTests/turtle-syntax-bad-esc-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-esc-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-esc-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-esc-02.ttl
index 62457ebf..62457ebf 100644
--- a/test/TurtleTests/turtle-syntax-bad-esc-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-esc-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-esc-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-esc-03.ttl
index a9b9f1c0..a9b9f1c0 100644
--- a/test/TurtleTests/turtle-syntax-bad-esc-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-esc-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-esc-04.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-esc-04.ttl
index a9b9f1c0..a9b9f1c0 100644
--- a/test/TurtleTests/turtle-syntax-bad-esc-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-esc-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-kw-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-kw-01.ttl
index f85448d6..f85448d6 100644
--- a/test/TurtleTests/turtle-syntax-bad-kw-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-kw-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-kw-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-kw-02.ttl
index d25986cd..d25986cd 100644
--- a/test/TurtleTests/turtle-syntax-bad-kw-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-kw-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-kw-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-kw-03.ttl
index 3d54b929..3d54b929 100644
--- a/test/TurtleTests/turtle-syntax-bad-kw-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-kw-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-kw-04.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-kw-04.ttl
index 229491ed..229491ed 100644
--- a/test/TurtleTests/turtle-syntax-bad-kw-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-kw-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-kw-05.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-kw-05.ttl
index c2420af5..c2420af5 100644
--- a/test/TurtleTests/turtle-syntax-bad-kw-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-kw-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-lang-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-lang-01.ttl
index 80685aae..80685aae 100644
--- a/test/TurtleTests/turtle-syntax-bad-lang-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-lang-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-ln-dash-start.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-ln-dash-start.ttl
index 9af36a1e..9af36a1e 100644
--- a/test/TurtleTests/turtle-syntax-bad-ln-dash-start.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-ln-dash-start.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-ln-escape-start.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-ln-escape-start.ttl
index 9c7a4352..9c7a4352 100644
--- a/test/TurtleTests/turtle-syntax-bad-ln-escape-start.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-ln-escape-start.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-ln-escape.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-ln-escape.ttl
index 212d43a0..212d43a0 100644
--- a/test/TurtleTests/turtle-syntax-bad-ln-escape.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-ln-escape.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-missing-ns-dot-end.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-missing-ns-dot-end.ttl
index d06f4e69..d06f4e69 100644
--- a/test/TurtleTests/turtle-syntax-bad-missing-ns-dot-end.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-missing-ns-dot-end.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-missing-ns-dot-start.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-missing-ns-dot-start.ttl
index 23514bcc..23514bcc 100644
--- a/test/TurtleTests/turtle-syntax-bad-missing-ns-dot-start.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-missing-ns-dot-start.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-01.ttl
index f7b19b72..f7b19b72 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-02.ttl
index e834f15f..e834f15f 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-03.ttl
index ad5d6ad4..ad5d6ad4 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-04.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-04.ttl
index 895f9ec6..895f9ec6 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-05.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-05.ttl
index de879b15..de879b15 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-06.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-06.ttl
index 56610f67..56610f67 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-06.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-06.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-07.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-07.ttl
index 419f7cad..419f7cad 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-07.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-07.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-08.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-08.ttl
index 419f7cad..419f7cad 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-08.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-08.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-09.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-09.ttl
index f093b588..f093b588 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-09.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-09.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-10.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-10.ttl
index 974252f0..974252f0 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-10.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-10.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-11.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-11.ttl
index b74d74a3..b74d74a3 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-11.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-11.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-12.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-12.ttl
index dc2c5b03..dc2c5b03 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-12.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-12.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-n3-extras-13.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-13.ttl
index 5f719a24..5f719a24 100644
--- a/test/TurtleTests/turtle-syntax-bad-n3-extras-13.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-n3-extras-13.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-ns-dot-end.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-ns-dot-end.ttl
index fa67031e..fa67031e 100644
--- a/test/TurtleTests/turtle-syntax-bad-ns-dot-end.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-ns-dot-end.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-ns-dot-start.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-ns-dot-start.ttl
index e09d5954..e09d5954 100644
--- a/test/TurtleTests/turtle-syntax-bad-ns-dot-start.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-ns-dot-start.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-num-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-num-01.ttl
index cb4730cb..cb4730cb 100644
--- a/test/TurtleTests/turtle-syntax-bad-num-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-num-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-num-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-num-02.ttl
index 1c8cbb25..1c8cbb25 100644
--- a/test/TurtleTests/turtle-syntax-bad-num-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-num-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-num-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-num-03.ttl
index 7c8fa2cf..7c8fa2cf 100644
--- a/test/TurtleTests/turtle-syntax-bad-num-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-num-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-num-04.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-num-04.ttl
index ad8e0cfd..ad8e0cfd 100644
--- a/test/TurtleTests/turtle-syntax-bad-num-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-num-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-num-05.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-num-05.ttl
index 2ee461a0..2ee461a0 100644
--- a/test/TurtleTests/turtle-syntax-bad-num-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-num-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-number-dot-in-anon.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-number-dot-in-anon.ttl
index 779cbece..779cbece 100644
--- a/test/TurtleTests/turtle-syntax-bad-number-dot-in-anon.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-number-dot-in-anon.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-pname-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-pname-01.ttl
index 5f3098da..5f3098da 100644
--- a/test/TurtleTests/turtle-syntax-bad-pname-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-pname-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-pname-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-pname-02.ttl
index fb30823c..fb30823c 100644
--- a/test/TurtleTests/turtle-syntax-bad-pname-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-pname-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-pname-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-pname-03.ttl
index b9af59e5..b9af59e5 100644
--- a/test/TurtleTests/turtle-syntax-bad-pname-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-pname-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-prefix-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-01.ttl
index b1b80df1..b1b80df1 100644
--- a/test/TurtleTests/turtle-syntax-bad-prefix-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-prefix-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-02.ttl
index 6e7269f2..6e7269f2 100644
--- a/test/TurtleTests/turtle-syntax-bad-prefix-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-prefix-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-03.ttl
index 1ab01e7b..1ab01e7b 100644
--- a/test/TurtleTests/turtle-syntax-bad-prefix-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-prefix-04.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-04.ttl
index 5f338f33..5f338f33 100644
--- a/test/TurtleTests/turtle-syntax-bad-prefix-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-prefix-05.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-05.ttl
index efb86c59..efb86c59 100644
--- a/test/TurtleTests/turtle-syntax-bad-prefix-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-prefix-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-string-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-string-01.ttl
index ef62a6c0..ef62a6c0 100644
--- a/test/TurtleTests/turtle-syntax-bad-string-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-string-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-string-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-string-02.ttl
index 2335d529..2335d529 100644
--- a/test/TurtleTests/turtle-syntax-bad-string-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-string-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-string-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-string-03.ttl
index 8a9e7ffe..8a9e7ffe 100644
--- a/test/TurtleTests/turtle-syntax-bad-string-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-string-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-string-04.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-string-04.ttl
index 9911defe..9911defe 100644
--- a/test/TurtleTests/turtle-syntax-bad-string-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-string-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-string-05.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-string-05.ttl
index f5de7403..f5de7403 100644
--- a/test/TurtleTests/turtle-syntax-bad-string-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-string-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-string-06.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-string-06.ttl
index 6bcbc936..6bcbc936 100644
--- a/test/TurtleTests/turtle-syntax-bad-string-06.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-string-06.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-string-07.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-string-07.ttl
index 534614d4..534614d4 100644
--- a/test/TurtleTests/turtle-syntax-bad-string-07.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-string-07.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-01.ttl
index 7b8b8529..7b8b8529 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-02.ttl
index cb86b9dd..cb86b9dd 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-03.ttl
index 98d9c7ec..98d9c7ec 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-04.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-04.ttl
index 40cd7b71..40cd7b71 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-05.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-05.ttl
index e1a3afbc..e1a3afbc 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-06.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-06.ttl
index 2680229a..2680229a 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-06.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-06.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-07.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-07.ttl
index 5f74a8b7..5f74a8b7 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-07.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-07.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-08.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-08.ttl
index 86aaf4be..86aaf4be 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-08.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-08.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-09.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-09.ttl
index 92aae4c2..92aae4c2 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-09.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-09.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-10.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-10.ttl
index eb893b24..eb893b24 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-10.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-10.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-11.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-11.ttl
index fc6bb993..fc6bb993 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-11.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-11.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-12.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-12.ttl
index 1038da86..1038da86 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-12.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-12.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-13.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-13.ttl
index 1038da86..1038da86 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-13.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-13.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-14.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-14.ttl
index 44db7be2..44db7be2 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-14.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-14.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-15.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-15.ttl
index 788cfd67..788cfd67 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-15.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-15.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-16.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-16.ttl
index d30a80be..d30a80be 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-16.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-16.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-struct-17.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-struct-17.ttl
index 50ea2656..50ea2656 100644
--- a/test/TurtleTests/turtle-syntax-bad-struct-17.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-struct-17.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-uri-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-uri-01.ttl
index ebea3f25..ebea3f25 100644
--- a/test/TurtleTests/turtle-syntax-bad-uri-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-uri-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-uri-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-uri-02.ttl
index e9096bc7..e9096bc7 100644
--- a/test/TurtleTests/turtle-syntax-bad-uri-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-uri-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-uri-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-uri-03.ttl
index 7fe2bf03..7fe2bf03 100644
--- a/test/TurtleTests/turtle-syntax-bad-uri-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-uri-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-uri-04.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-uri-04.ttl
index 258997cb..258997cb 100644
--- a/test/TurtleTests/turtle-syntax-bad-uri-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-uri-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-bad-uri-05.ttl b/test/w3c/TurtleTests/turtle-syntax-bad-uri-05.ttl
index 542b2b64..542b2b64 100644
--- a/test/TurtleTests/turtle-syntax-bad-uri-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bad-uri-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-base-01.ttl b/test/w3c/TurtleTests/turtle-syntax-base-01.ttl
index 108ceaf5..108ceaf5 100644
--- a/test/TurtleTests/turtle-syntax-base-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-base-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-base-02.ttl b/test/w3c/TurtleTests/turtle-syntax-base-02.ttl
index 7a2724f7..7a2724f7 100644
--- a/test/TurtleTests/turtle-syntax-base-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-base-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-base-03.ttl b/test/w3c/TurtleTests/turtle-syntax-base-03.ttl
index e90dc14a..e90dc14a 100644
--- a/test/TurtleTests/turtle-syntax-base-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-base-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-base-04.ttl b/test/w3c/TurtleTests/turtle-syntax-base-04.ttl
index b0bb4226..b0bb4226 100644
--- a/test/TurtleTests/turtle-syntax-base-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-base-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-blank-label.ttl b/test/w3c/TurtleTests/turtle-syntax-blank-label.ttl
index b7fae10d..b7fae10d 100644
--- a/test/TurtleTests/turtle-syntax-blank-label.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-blank-label.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-01.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-01.ttl
index 274a478c..274a478c 100644
--- a/test/TurtleTests/turtle-syntax-bnode-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-02.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-02.ttl
index 91b9c16e..91b9c16e 100644
--- a/test/TurtleTests/turtle-syntax-bnode-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-03.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-03.ttl
index 36c8450f..36c8450f 100644
--- a/test/TurtleTests/turtle-syntax-bnode-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-04.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-04.ttl
index 942dedd7..942dedd7 100644
--- a/test/TurtleTests/turtle-syntax-bnode-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-05.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-05.ttl
index c2f4169c..c2f4169c 100644
--- a/test/TurtleTests/turtle-syntax-bnode-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-06.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-06.ttl
index f9ffec8c..f9ffec8c 100644
--- a/test/TurtleTests/turtle-syntax-bnode-06.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-06.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-07.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-07.ttl
index c0dba051..c0dba051 100644
--- a/test/TurtleTests/turtle-syntax-bnode-07.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-07.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-08.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-08.ttl
index 630843b0..630843b0 100644
--- a/test/TurtleTests/turtle-syntax-bnode-08.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-08.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-09.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-09.ttl
index cd75e3a3..cd75e3a3 100644
--- a/test/TurtleTests/turtle-syntax-bnode-09.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-09.ttl
diff --git a/test/TurtleTests/turtle-syntax-bnode-10.ttl b/test/w3c/TurtleTests/turtle-syntax-bnode-10.ttl
index 03fa67ca..03fa67ca 100644
--- a/test/TurtleTests/turtle-syntax-bnode-10.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-bnode-10.ttl
diff --git a/test/TurtleTests/turtle-syntax-datatypes-01.ttl b/test/w3c/TurtleTests/turtle-syntax-datatypes-01.ttl
index 9e273c51..9e273c51 100644
--- a/test/TurtleTests/turtle-syntax-datatypes-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-datatypes-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-datatypes-02.ttl b/test/w3c/TurtleTests/turtle-syntax-datatypes-02.ttl
index 477bd73c..477bd73c 100644
--- a/test/TurtleTests/turtle-syntax-datatypes-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-datatypes-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-file-01.ttl b/test/w3c/TurtleTests/turtle-syntax-file-01.ttl
index e69de29b..e69de29b 100644
--- a/test/TurtleTests/turtle-syntax-file-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-file-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-file-02.ttl b/test/w3c/TurtleTests/turtle-syntax-file-02.ttl
index e6d327d5..e6d327d5 100644
--- a/test/TurtleTests/turtle-syntax-file-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-file-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-file-03.ttl b/test/w3c/TurtleTests/turtle-syntax-file-03.ttl
index a9ca0358..a9ca0358 100644
--- a/test/TurtleTests/turtle-syntax-file-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-file-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-kw-01.ttl b/test/w3c/TurtleTests/turtle-syntax-kw-01.ttl
index 854c7568..854c7568 100644
--- a/test/TurtleTests/turtle-syntax-kw-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-kw-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-kw-02.ttl b/test/w3c/TurtleTests/turtle-syntax-kw-02.ttl
index c948160b..c948160b 100644
--- a/test/TurtleTests/turtle-syntax-kw-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-kw-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-kw-03.ttl b/test/w3c/TurtleTests/turtle-syntax-kw-03.ttl
index bb479bfa..bb479bfa 100644
--- a/test/TurtleTests/turtle-syntax-kw-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-kw-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-lists-01.ttl b/test/w3c/TurtleTests/turtle-syntax-lists-01.ttl
index c6ee0fbe..c6ee0fbe 100644
--- a/test/TurtleTests/turtle-syntax-lists-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-lists-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-lists-02.ttl b/test/w3c/TurtleTests/turtle-syntax-lists-02.ttl
index 06a0cd1e..06a0cd1e 100644
--- a/test/TurtleTests/turtle-syntax-lists-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-lists-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-lists-03.ttl b/test/w3c/TurtleTests/turtle-syntax-lists-03.ttl
index e71f0273..e71f0273 100644
--- a/test/TurtleTests/turtle-syntax-lists-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-lists-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-lists-04.ttl b/test/w3c/TurtleTests/turtle-syntax-lists-04.ttl
index a9885389..a9885389 100644
--- a/test/TurtleTests/turtle-syntax-lists-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-lists-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-lists-05.ttl b/test/w3c/TurtleTests/turtle-syntax-lists-05.ttl
index 43e68a44..43e68a44 100644
--- a/test/TurtleTests/turtle-syntax-lists-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-lists-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-ln-colons.ttl b/test/w3c/TurtleTests/turtle-syntax-ln-colons.ttl
index 80a2e3df..80a2e3df 100644
--- a/test/TurtleTests/turtle-syntax-ln-colons.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-ln-colons.ttl
diff --git a/test/TurtleTests/turtle-syntax-ln-dots.ttl b/test/w3c/TurtleTests/turtle-syntax-ln-dots.ttl
index ca5bba97..ca5bba97 100644
--- a/test/TurtleTests/turtle-syntax-ln-dots.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-ln-dots.ttl
diff --git a/test/TurtleTests/turtle-syntax-ns-dots.ttl b/test/w3c/TurtleTests/turtle-syntax-ns-dots.ttl
index 1059b576..1059b576 100644
--- a/test/TurtleTests/turtle-syntax-ns-dots.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-ns-dots.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-01.ttl b/test/w3c/TurtleTests/turtle-syntax-number-01.ttl
index 016fa8f2..016fa8f2 100644
--- a/test/TurtleTests/turtle-syntax-number-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-02.ttl b/test/w3c/TurtleTests/turtle-syntax-number-02.ttl
index 66d1b389..66d1b389 100644
--- a/test/TurtleTests/turtle-syntax-number-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-03.ttl b/test/w3c/TurtleTests/turtle-syntax-number-03.ttl
index 44142857..44142857 100644
--- a/test/TurtleTests/turtle-syntax-number-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-04.ttl b/test/w3c/TurtleTests/turtle-syntax-number-04.ttl
index ab48cbc6..ab48cbc6 100644
--- a/test/TurtleTests/turtle-syntax-number-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-05.ttl b/test/w3c/TurtleTests/turtle-syntax-number-05.ttl
index a8d5845a..a8d5845a 100644
--- a/test/TurtleTests/turtle-syntax-number-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-06.ttl b/test/w3c/TurtleTests/turtle-syntax-number-06.ttl
index cb3a2b06..cb3a2b06 100644
--- a/test/TurtleTests/turtle-syntax-number-06.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-06.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-07.ttl b/test/w3c/TurtleTests/turtle-syntax-number-07.ttl
index 8b0050e6..8b0050e6 100644
--- a/test/TurtleTests/turtle-syntax-number-07.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-07.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-08.ttl b/test/w3c/TurtleTests/turtle-syntax-number-08.ttl
index 70ddeed3..70ddeed3 100644
--- a/test/TurtleTests/turtle-syntax-number-08.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-08.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-09.ttl b/test/w3c/TurtleTests/turtle-syntax-number-09.ttl
index 386b819f..386b819f 100644
--- a/test/TurtleTests/turtle-syntax-number-09.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-09.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-10.ttl b/test/w3c/TurtleTests/turtle-syntax-number-10.ttl
index 46875e94..46875e94 100644
--- a/test/TurtleTests/turtle-syntax-number-10.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-10.ttl
diff --git a/test/TurtleTests/turtle-syntax-number-11.ttl b/test/w3c/TurtleTests/turtle-syntax-number-11.ttl
index 1d8c367e..1d8c367e 100644
--- a/test/TurtleTests/turtle-syntax-number-11.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-number-11.ttl
diff --git a/test/TurtleTests/turtle-syntax-pname-esc-01.ttl b/test/w3c/TurtleTests/turtle-syntax-pname-esc-01.ttl
index 5a3a5fd7..5a3a5fd7 100644
--- a/test/TurtleTests/turtle-syntax-pname-esc-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-pname-esc-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-pname-esc-02.ttl b/test/w3c/TurtleTests/turtle-syntax-pname-esc-02.ttl
index 5d806cf4..5d806cf4 100644
--- a/test/TurtleTests/turtle-syntax-pname-esc-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-pname-esc-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-pname-esc-03.ttl b/test/w3c/TurtleTests/turtle-syntax-pname-esc-03.ttl
index 9949c52b..9949c52b 100644
--- a/test/TurtleTests/turtle-syntax-pname-esc-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-pname-esc-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-prefix-01.ttl b/test/w3c/TurtleTests/turtle-syntax-prefix-01.ttl
index 7fd69327..7fd69327 100644
--- a/test/TurtleTests/turtle-syntax-prefix-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-prefix-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-prefix-02.ttl b/test/w3c/TurtleTests/turtle-syntax-prefix-02.ttl
index 99d4ae45..99d4ae45 100644
--- a/test/TurtleTests/turtle-syntax-prefix-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-prefix-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-prefix-03.ttl b/test/w3c/TurtleTests/turtle-syntax-prefix-03.ttl
index c834d10f..c834d10f 100644
--- a/test/TurtleTests/turtle-syntax-prefix-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-prefix-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-prefix-04.ttl b/test/w3c/TurtleTests/turtle-syntax-prefix-04.ttl
index 4ff94dc0..4ff94dc0 100644
--- a/test/TurtleTests/turtle-syntax-prefix-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-prefix-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-prefix-05.ttl b/test/w3c/TurtleTests/turtle-syntax-prefix-05.ttl
index 30441026..30441026 100644
--- a/test/TurtleTests/turtle-syntax-prefix-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-prefix-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-prefix-06.ttl b/test/w3c/TurtleTests/turtle-syntax-prefix-06.ttl
index 7044be5a..7044be5a 100644
--- a/test/TurtleTests/turtle-syntax-prefix-06.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-prefix-06.ttl
diff --git a/test/TurtleTests/turtle-syntax-prefix-07.ttl b/test/w3c/TurtleTests/turtle-syntax-prefix-07.ttl
index 1db61e8a..1db61e8a 100644
--- a/test/TurtleTests/turtle-syntax-prefix-07.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-prefix-07.ttl
diff --git a/test/TurtleTests/turtle-syntax-prefix-08.ttl b/test/w3c/TurtleTests/turtle-syntax-prefix-08.ttl
index f969a4af..f969a4af 100644
--- a/test/TurtleTests/turtle-syntax-prefix-08.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-prefix-08.ttl
diff --git a/test/TurtleTests/turtle-syntax-prefix-09.ttl b/test/w3c/TurtleTests/turtle-syntax-prefix-09.ttl
index 5c57ebea..5c57ebea 100644
--- a/test/TurtleTests/turtle-syntax-prefix-09.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-prefix-09.ttl
diff --git a/test/TurtleTests/turtle-syntax-str-esc-01.ttl b/test/w3c/TurtleTests/turtle-syntax-str-esc-01.ttl
index f11f2827..f11f2827 100644
--- a/test/TurtleTests/turtle-syntax-str-esc-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-str-esc-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-str-esc-02.ttl b/test/w3c/TurtleTests/turtle-syntax-str-esc-02.ttl
index 0b77f95a..0b77f95a 100644
--- a/test/TurtleTests/turtle-syntax-str-esc-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-str-esc-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-str-esc-03.ttl b/test/w3c/TurtleTests/turtle-syntax-str-esc-03.ttl
index af1e3281..af1e3281 100644
--- a/test/TurtleTests/turtle-syntax-str-esc-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-str-esc-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-01.ttl b/test/w3c/TurtleTests/turtle-syntax-string-01.ttl
index 7bf8a6d4..7bf8a6d4 100644
--- a/test/TurtleTests/turtle-syntax-string-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-02.ttl b/test/w3c/TurtleTests/turtle-syntax-string-02.ttl
index 8cb89e98..8cb89e98 100644
--- a/test/TurtleTests/turtle-syntax-string-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-03.ttl b/test/w3c/TurtleTests/turtle-syntax-string-03.ttl
index 312d1d67..312d1d67 100644
--- a/test/TurtleTests/turtle-syntax-string-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-04.ttl b/test/w3c/TurtleTests/turtle-syntax-string-04.ttl
index 3ecdea3a..3ecdea3a 100644
--- a/test/TurtleTests/turtle-syntax-string-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-05.ttl b/test/w3c/TurtleTests/turtle-syntax-string-05.ttl
index f32b6d02..f32b6d02 100644
--- a/test/TurtleTests/turtle-syntax-string-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-06.ttl b/test/w3c/TurtleTests/turtle-syntax-string-06.ttl
index 77399380..77399380 100644
--- a/test/TurtleTests/turtle-syntax-string-06.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-06.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-07.ttl b/test/w3c/TurtleTests/turtle-syntax-string-07.ttl
index 6c3e6a44..6c3e6a44 100644
--- a/test/TurtleTests/turtle-syntax-string-07.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-07.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-08.ttl b/test/w3c/TurtleTests/turtle-syntax-string-08.ttl
index 2fb0227b..2fb0227b 100644
--- a/test/TurtleTests/turtle-syntax-string-08.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-08.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-09.ttl b/test/w3c/TurtleTests/turtle-syntax-string-09.ttl
index 390c8af9..390c8af9 100644
--- a/test/TurtleTests/turtle-syntax-string-09.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-09.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-10.ttl b/test/w3c/TurtleTests/turtle-syntax-string-10.ttl
index 5b6e5c35..5b6e5c35 100644
--- a/test/TurtleTests/turtle-syntax-string-10.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-10.ttl
diff --git a/test/TurtleTests/turtle-syntax-string-11.ttl b/test/w3c/TurtleTests/turtle-syntax-string-11.ttl
index 7b78abf1..7b78abf1 100644
--- a/test/TurtleTests/turtle-syntax-string-11.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-string-11.ttl
diff --git a/test/TurtleTests/turtle-syntax-struct-01.ttl b/test/w3c/TurtleTests/turtle-syntax-struct-01.ttl
index 990e5160..990e5160 100644
--- a/test/TurtleTests/turtle-syntax-struct-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-struct-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-struct-02.ttl b/test/w3c/TurtleTests/turtle-syntax-struct-02.ttl
index 0684b2fe..0684b2fe 100644
--- a/test/TurtleTests/turtle-syntax-struct-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-struct-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-struct-03.ttl b/test/w3c/TurtleTests/turtle-syntax-struct-03.ttl
index 1e303515..1e303515 100644
--- a/test/TurtleTests/turtle-syntax-struct-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-struct-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-struct-04.ttl b/test/w3c/TurtleTests/turtle-syntax-struct-04.ttl
index 3d1bf3b0..3d1bf3b0 100644
--- a/test/TurtleTests/turtle-syntax-struct-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-struct-04.ttl
diff --git a/test/TurtleTests/turtle-syntax-struct-05.ttl b/test/w3c/TurtleTests/turtle-syntax-struct-05.ttl
index c39e0411..c39e0411 100644
--- a/test/TurtleTests/turtle-syntax-struct-05.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-struct-05.ttl
diff --git a/test/TurtleTests/turtle-syntax-uri-01.ttl b/test/w3c/TurtleTests/turtle-syntax-uri-01.ttl
index 2e2d5baf..2e2d5baf 100644
--- a/test/TurtleTests/turtle-syntax-uri-01.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-uri-01.ttl
diff --git a/test/TurtleTests/turtle-syntax-uri-02.ttl b/test/w3c/TurtleTests/turtle-syntax-uri-02.ttl
index f355d38c..f355d38c 100644
--- a/test/TurtleTests/turtle-syntax-uri-02.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-uri-02.ttl
diff --git a/test/TurtleTests/turtle-syntax-uri-03.ttl b/test/w3c/TurtleTests/turtle-syntax-uri-03.ttl
index 0ea581af..0ea581af 100644
--- a/test/TurtleTests/turtle-syntax-uri-03.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-uri-03.ttl
diff --git a/test/TurtleTests/turtle-syntax-uri-04.ttl b/test/w3c/TurtleTests/turtle-syntax-uri-04.ttl
index db805c8f..db805c8f 100644
--- a/test/TurtleTests/turtle-syntax-uri-04.ttl
+++ b/test/w3c/TurtleTests/turtle-syntax-uri-04.ttl
diff --git a/test/TurtleTests/two_LITERAL_LONG2s.nt b/test/w3c/TurtleTests/two_LITERAL_LONG2s.nt
index af94fe6a..af94fe6a 100644
--- a/test/TurtleTests/two_LITERAL_LONG2s.nt
+++ b/test/w3c/TurtleTests/two_LITERAL_LONG2s.nt
diff --git a/test/TurtleTests/two_LITERAL_LONG2s.ttl b/test/w3c/TurtleTests/two_LITERAL_LONG2s.ttl
index ceaad3d4..ceaad3d4 100644
--- a/test/TurtleTests/two_LITERAL_LONG2s.ttl
+++ b/test/w3c/TurtleTests/two_LITERAL_LONG2s.ttl
diff --git a/test/TurtleTests/underscore_in_localName.nt b/test/w3c/TurtleTests/underscore_in_localName.nt
index f9d0c4f1..f9d0c4f1 100644
--- a/test/TurtleTests/underscore_in_localName.nt
+++ b/test/w3c/TurtleTests/underscore_in_localName.nt
diff --git a/test/TurtleTests/underscore_in_localName.ttl b/test/w3c/TurtleTests/underscore_in_localName.ttl
index 34596fdf..34596fdf 100644
--- a/test/TurtleTests/underscore_in_localName.ttl
+++ b/test/w3c/TurtleTests/underscore_in_localName.ttl