diff --git a/test/extra/bad/bad-lang-start-delete.nt b/test/extra/bad/bad-lang-start-delete.nt
new file mode 100644
index 00000000..122625e0
--- /dev/null
+++ b/test/extra/bad/bad-lang-start-delete.nt

diff --git a/test/extra/bad/bad-lang-start-space.nt b/test/extra/bad/bad-lang-start-space.nt
new file mode 100644
index 00000000..ff5c12ab
--- /dev/null
+++ b/test/extra/bad/bad-lang-start-space.nt

diff --git a/test/extra/bad/bad-lang-start-tab.nt b/test/extra/bad/bad-lang-start-tab.nt
new file mode 100644
index 00000000..ad005c6d
--- /dev/null
+++ b/test/extra/bad/bad-lang-start-tab.nt

diff --git a/test/extra/bad/bad-lang-start-wide.nt b/test/extra/bad/bad-lang-start-wide.nt
new file mode 100644
index 00000000..04ca4899
--- /dev/null
+++ b/test/extra/bad/bad-lang-start-wide.nt

diff --git a/test/extra/bad/bad-lang.ttl b/test/extra/bad/bad-lang.ttl
index 01e04328..b51df89c 100644
--- a/test/extra/bad/bad-lang.ttl
+++ b/test/extra/bad/bad-lang.ttl

diff --git a/test/extra/bad/bad-uri-scheme-start-apostrophe.nt b/test/extra/bad/bad-uri-scheme-start-apostrophe.nt
new file mode 100644
index 00000000..265b46d1
--- /dev/null
+++ b/test/extra/bad/bad-uri-scheme-start-apostrophe.nt

diff --git a/test/extra/bad/bad-uri-scheme-start-delete.nt b/test/extra/bad/bad-uri-scheme-start-delete.nt
new file mode 100644
index 00000000..70b4962a
--- /dev/null
+++ b/test/extra/bad/bad-uri-scheme-start-delete.nt

diff --git a/test/extra/bad/bad-uri-scheme-start-space.nt b/test/extra/bad/bad-uri-scheme-start-space.nt
new file mode 100644
index 00000000..d396d6dd
--- /dev/null
+++ b/test/extra/bad/bad-uri-scheme-start-space.nt

diff --git a/test/extra/bad/bad-uri-scheme-start-tab.nt b/test/extra/bad/bad-uri-scheme-start-tab.nt
new file mode 100644
index 00000000..458a5743
--- /dev/null
+++ b/test/extra/bad/bad-uri-scheme-start-tab.nt

diff --git a/test/extra/bad/bad-uri-scheme-start-wide.nt b/test/extra/bad/bad-uri-scheme-start-wide.nt
new file mode 100644
index 00000000..7ddfff60
--- /dev/null
+++ b/test/extra/bad/bad-uri-scheme-start-wide.nt

diff --git a/test/extra/bad/bad-uri-scheme-start.nt b/test/extra/bad/bad-uri-scheme-start.nt
deleted file mode 100644
index cd3fd70f..00000000
--- a/test/extra/bad/bad-uri-scheme-start.nt
+++ /dev/null

diff --git a/test/extra/bad/manifest.ttl b/test/extra/bad/manifest.ttl
index 64dbf05f..a4bb4b4f 100644
--- a/test/extra/bad/manifest.ttl
+++ b/test/extra/bad/manifest.ttl

diff --git a/test/extra/eof/README.md b/test/extra/eof/README.md
new file mode 100644
index 00000000..1e461f79
--- /dev/null
+++ b/test/extra/eof/README.md

diff --git a/test/extra/bad/bad-nt-eof-after-blank.nt b/test/extra/eof/bad-nt-eof-after-blank.nt
index bc66ca37..bc66ca37 100644
--- a/test/extra/bad/bad-nt-eof-after-blank.nt
+++ b/test/extra/eof/bad-nt-eof-after-blank.nt

diff --git a/test/extra/bad/bad-nt-eof-after-lang-hyphen.nt b/test/extra/eof/bad-nt-eof-after-lang-hyphen.nt
index 9e885d80..9e885d80 100644
--- a/test/extra/bad/bad-nt-eof-after-lang-hyphen.nt
+++ b/test/extra/eof/bad-nt-eof-after-lang-hyphen.nt

diff --git a/test/extra/bad/bad-nt-eof-after-lang-subtag.nt b/test/extra/eof/bad-nt-eof-after-lang-subtag.nt
index f8158aec..f8158aec 100644
--- a/test/extra/bad/bad-nt-eof-after-lang-subtag.nt
+++ b/test/extra/eof/bad-nt-eof-after-lang-subtag.nt

diff --git a/test/extra/bad/bad-nt-eof-after-lang.nt b/test/extra/eof/bad-nt-eof-after-lang.nt
index 7ab04b06..7ab04b06 100644
--- a/test/extra/bad/bad-nt-eof-after-lang.nt
+++ b/test/extra/eof/bad-nt-eof-after-lang.nt

diff --git a/test/extra/bad/bad-nt-eof-after-object.nt b/test/extra/eof/bad-nt-eof-after-object.nt
index e796f2b0..e796f2b0 100644
--- a/test/extra/bad/bad-nt-eof-after-object.nt
+++ b/test/extra/eof/bad-nt-eof-after-object.nt

diff --git a/test/extra/bad/bad-nt-eof-after-predicate.nt b/test/extra/eof/bad-nt-eof-after-predicate.nt
index ea47bfbe..ea47bfbe 100644
--- a/test/extra/bad/bad-nt-eof-after-predicate.nt
+++ b/test/extra/eof/bad-nt-eof-after-predicate.nt

diff --git a/test/extra/bad/bad-nt-eof-after-string-escape.nt b/test/extra/eof/bad-nt-eof-after-string-escape.nt
index 869907e8..869907e8 100644
--- a/test/extra/bad/bad-nt-eof-after-string-escape.nt
+++ b/test/extra/eof/bad-nt-eof-after-string-escape.nt

diff --git a/test/extra/bad/bad-nt-eof-after-string.nt b/test/extra/eof/bad-nt-eof-after-string.nt
index 32dda36d..32dda36d 100644
--- a/test/extra/bad/bad-nt-eof-after-string.nt
+++ b/test/extra/eof/bad-nt-eof-after-string.nt

diff --git a/test/extra/bad/bad-nt-eof-after-subject.nt b/test/extra/eof/bad-nt-eof-after-subject.nt
index 21fa07f4..21fa07f4 100644
--- a/test/extra/bad/bad-nt-eof-after-subject.nt
+++ b/test/extra/eof/bad-nt-eof-after-subject.nt

diff --git a/test/extra/bad/bad-nt-eof-after-underscore.nt b/test/extra/eof/bad-nt-eof-after-underscore.nt
index 4b05f2ac..4b05f2ac 100644
--- a/test/extra/bad/bad-nt-eof-after-underscore.nt
+++ b/test/extra/eof/bad-nt-eof-after-underscore.nt

diff --git a/test/extra/bad/bad-nt-eof-before-blank.nt b/test/extra/eof/bad-nt-eof-before-blank.nt
index 99f70844..99f70844 100644
--- a/test/extra/bad/bad-nt-eof-before-blank.nt
+++ b/test/extra/eof/bad-nt-eof-before-blank.nt

diff --git a/test/extra/bad/bad-nt-eof-before-iri.nt b/test/extra/eof/bad-nt-eof-before-iri.nt
index c5fa7845..c5fa7845 100644
--- a/test/extra/bad/bad-nt-eof-before-iri.nt
+++ b/test/extra/eof/bad-nt-eof-before-iri.nt

diff --git a/test/extra/bad/bad-nt-eof-before-lang.nt b/test/extra/eof/bad-nt-eof-before-lang.nt
index f1a9d0df..f1a9d0df 100644
--- a/test/extra/bad/bad-nt-eof-before-lang.nt
+++ b/test/extra/eof/bad-nt-eof-before-lang.nt

diff --git a/test/extra/bad/bad-nt-eof-before-string-escape.nt b/test/extra/eof/bad-nt-eof-before-string-escape.nt
index 30443488..30443488 100644
--- a/test/extra/bad/bad-nt-eof-before-string-escape.nt
+++ b/test/extra/eof/bad-nt-eof-before-string-escape.nt

diff --git a/test/extra/bad/bad-nt-eof-before-string.nt b/test/extra/eof/bad-nt-eof-before-string.nt
index 6a2a7543..6a2a7543 100644
--- a/test/extra/bad/bad-nt-eof-before-string.nt
+++ b/test/extra/eof/bad-nt-eof-before-string.nt

diff --git a/test/extra/bad/bad-nt-eof-in-iri-path.nt b/test/extra/eof/bad-nt-eof-in-iri-path.nt
index e8555e2b..e8555e2b 100644
--- a/test/extra/bad/bad-nt-eof-in-iri-path.nt
+++ b/test/extra/eof/bad-nt-eof-in-iri-path.nt

diff --git a/test/extra/bad/bad-nt-eof-in-iri-scheme.nt b/test/extra/eof/bad-nt-eof-in-iri-scheme.nt
index 2c071547..2c071547 100644
--- a/test/extra/bad/bad-nt-eof-in-iri-scheme.nt
+++ b/test/extra/eof/bad-nt-eof-in-iri-scheme.nt

diff --git a/test/extra/bad/bad-nt-eof-in-string.nt b/test/extra/eof/bad-nt-eof-in-string.nt
index 98944654..98944654 100644
--- a/test/extra/bad/bad-nt-eof-in-string.nt
+++ b/test/extra/eof/bad-nt-eof-in-string.nt

diff --git a/test/extra/bad/bad-eof-after-quotes.ttl b/test/extra/eof/bad-ttl-eof-after-quotes.ttl
index 40e429cb..40e429cb 100644
--- a/test/extra/bad/bad-eof-after-quotes.ttl
+++ b/test/extra/eof/bad-ttl-eof-after-quotes.ttl

diff --git a/test/extra/bad/bad-eof-at-string-start.ttl b/test/extra/eof/bad-ttl-eof-at-string-start.ttl
index 93d20bcc..93d20bcc 100644
--- a/test/extra/bad/bad-eof-at-string-start.ttl
+++ b/test/extra/eof/bad-ttl-eof-at-string-start.ttl

diff --git a/test/extra/bad/bad-eof-in-blank.ttl b/test/extra/eof/bad-ttl-eof-in-blank.ttl
index 8cf4ee84..8cf4ee84 100644
--- a/test/extra/bad/bad-eof-in-blank.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-blank.ttl

diff --git a/test/extra/bad/bad-eof-in-escape.ttl b/test/extra/eof/bad-ttl-eof-in-escape.ttl
index 24b4eec6..24b4eec6 100644
--- a/test/extra/bad/bad-eof-in-escape.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-escape.ttl

diff --git a/test/extra/bad/bad-eof-in-lang-suffix.ttl b/test/extra/eof/bad-ttl-eof-in-lang-suffix.ttl
index f46a7763..f46a7763 100644
--- a/test/extra/bad/bad-eof-in-lang-suffix.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-lang-suffix.ttl

diff --git a/test/extra/bad/bad-eof-in-lang.ttl b/test/extra/eof/bad-ttl-eof-in-lang.ttl
index bfdffd02..bfdffd02 100644
--- a/test/extra/bad/bad-eof-in-lang.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-lang.ttl

diff --git a/test/extra/bad/bad-eof-in-list.ttl b/test/extra/eof/bad-ttl-eof-in-list.ttl
index 13eeb88d..13eeb88d 100644
--- a/test/extra/bad/bad-eof-in-list.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-list.ttl

diff --git a/test/extra/bad/bad-eof-in-long-string.ttl b/test/extra/eof/bad-ttl-eof-in-long-string.ttl
index 2ef179a8..2ef179a8 100644
--- a/test/extra/bad/bad-eof-in-long-string.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-long-string.ttl

diff --git a/test/extra/bad/bad-eof-in-object-list.ttl b/test/extra/eof/bad-ttl-eof-in-object-list.ttl
index 9bbcd17a..9bbcd17a 100644
--- a/test/extra/bad/bad-eof-in-object-list.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-object-list.ttl

diff --git a/test/extra/bad/bad-eof-in-object-list2.ttl b/test/extra/eof/bad-ttl-eof-in-object-list2.ttl
index 9186fb9f..9186fb9f 100644
--- a/test/extra/bad/bad-eof-in-object-list2.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-object-list2.ttl

diff --git a/test/extra/bad/bad-eof-in-predicate-list.ttl b/test/extra/eof/bad-ttl-eof-in-predicate-list.ttl
index eab5b05b..eab5b05b 100644
--- a/test/extra/bad/bad-eof-in-predicate-list.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-predicate-list.ttl

diff --git a/test/extra/bad/bad-eof-in-string.ttl b/test/extra/eof/bad-ttl-eof-in-string.ttl
index bb6e817f..bb6e817f 100644
--- a/test/extra/bad/bad-eof-in-string.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-string.ttl

diff --git a/test/extra/bad/bad-eof-in-text-character.ttl b/test/extra/eof/bad-ttl-eof-in-text-character.ttl
index a614803a..a614803a 100644
--- a/test/extra/bad/bad-eof-in-text-character.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-text-character.ttl

diff --git a/test/extra/bad/bad-eof-in-triple-quote.ttl b/test/extra/eof/bad-ttl-eof-in-triple-quote.ttl
index fb935441..fb935441 100644
--- a/test/extra/bad/bad-eof-in-triple-quote.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-triple-quote.ttl

diff --git a/test/extra/bad/bad-eof-in-uri-character.ttl b/test/extra/eof/bad-ttl-eof-in-uri-character.ttl
index eda70770..eda70770 100644
--- a/test/extra/bad/bad-eof-in-uri-character.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-uri-character.ttl

diff --git a/test/extra/bad/bad-eof-in-uri-scheme.nt b/test/extra/eof/bad-ttl-eof-in-uri-scheme.ttl
index de892dcf..de892dcf 100644
--- a/test/extra/bad/bad-eof-in-uri-scheme.nt
+++ b/test/extra/eof/bad-ttl-eof-in-uri-scheme.ttl

diff --git a/test/extra/bad/bad-eof-in-uri.ttl b/test/extra/eof/bad-ttl-eof-in-uri.ttl
index 07b6e6ab..07b6e6ab 100644
--- a/test/extra/bad/bad-eof-in-uri.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-uri.ttl

diff --git a/test/extra/bad/bad-eof-in-utf8-character.ttl b/test/extra/eof/bad-ttl-eof-in-utf8-character.ttl
index 16784e88..16784e88 100644
--- a/test/extra/bad/bad-eof-in-utf8-character.ttl
+++ b/test/extra/eof/bad-ttl-eof-in-utf8-character.ttl

diff --git a/test/extra/eof/manifest.ttl b/test/extra/eof/manifest.ttl
new file mode 100644
index 00000000..465333f7
--- /dev/null
+++ b/test/extra/eof/manifest.ttl

diff --git a/test/extra/good/manifest.ttl b/test/extra/good/manifest.ttl
index 350d7d9c..659f8fd1 100644
--- a/test/extra/good/manifest.ttl
+++ b/test/extra/good/manifest.ttl

diff --git a/test/extra/good/test-bom-only.nt b/test/extra/good/test-bom-only.nt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/extra/good/test-bom-only.nt

diff --git a/test/extra/good/test-bom-only.ttl b/test/extra/good/test-bom-only.ttl
new file mode 100644
index 00000000..5f282702
--- /dev/null
+++ b/test/extra/good/test-bom-only.ttl

diff --git a/test/extra/good/test-boolish-prefix.nt b/test/extra/good/test-boolish-prefix.nt
new file mode 100644
index 00000000..d49eeab2
--- /dev/null
+++ b/test/extra/good/test-boolish-prefix.nt

diff --git a/test/extra/good/test-boolish-prefix.ttl b/test/extra/good/test-boolish-prefix.ttl
new file mode 100644
index 00000000..81ffdf11
--- /dev/null
+++ b/test/extra/good/test-boolish-prefix.ttl

diff --git a/test/extra/good/test-decimal-ends-with-dot.nt b/test/extra/good/test-decimal-ends-with-dot.nt
new file mode 100644
index 00000000..be0802bc
--- /dev/null
+++ b/test/extra/good/test-decimal-ends-with-dot.nt

diff --git a/test/extra/good/test-decimal-ends-with-dot.ttl b/test/extra/good/test-decimal-ends-with-dot.ttl
new file mode 100644
index 00000000..a63970d3
--- /dev/null
+++ b/test/extra/good/test-decimal-ends-with-dot.ttl

diff --git a/test/extra/good/test-double-ends-with-dot.nt b/test/extra/good/test-double-ends-with-dot.nt
new file mode 100644
index 00000000..20e4395e
--- /dev/null
+++ b/test/extra/good/test-double-ends-with-dot.nt

diff --git a/test/extra/good/test-double-ends-with-dot.ttl b/test/extra/good/test-double-ends-with-dot.ttl
new file mode 100644
index 00000000..4bd17a0b
--- /dev/null
+++ b/test/extra/good/test-double-ends-with-dot.ttl

diff --git a/test/extra/good/test-false-ends-with-dot.nt b/test/extra/good/test-false-ends-with-dot.nt
new file mode 100644
index 00000000..3b811813
--- /dev/null
+++ b/test/extra/good/test-false-ends-with-dot.nt

diff --git a/test/extra/good/test-false-ends-with-dot.ttl b/test/extra/good/test-false-ends-with-dot.ttl
new file mode 100644
index 00000000..14e2aa90
--- /dev/null
+++ b/test/extra/good/test-false-ends-with-dot.ttl

diff --git a/test/extra/good/test-integer-ends-with-dot.nt b/test/extra/good/test-integer-ends-with-dot.nt
new file mode 100644
index 00000000..7d6ff362
--- /dev/null
+++ b/test/extra/good/test-integer-ends-with-dot.nt

diff --git a/test/extra/good/test-integer-ends-with-dot.ttl b/test/extra/good/test-integer-ends-with-dot.ttl
new file mode 100644
index 00000000..350ea41d
--- /dev/null
+++ b/test/extra/good/test-integer-ends-with-dot.ttl

diff --git a/test/extra/good/test-nq-syntax-all-rules.nq b/test/extra/good/test-nq-syntax-all-rules.nq
index a8b80b9a..f9bffe20 100644
--- a/test/extra/good/test-nq-syntax-all-rules.nq
+++ b/test/extra/good/test-nq-syntax-all-rules.nq

diff --git a/test/extra/good/test-nt-syntax-all-rules.nt b/test/extra/good/test-nt-syntax-all-rules.nt
index ed84f410..c626a702 100644
--- a/test/extra/good/test-nt-syntax-all-rules.nt
+++ b/test/extra/good/test-nt-syntax-all-rules.nt

diff --git a/test/extra/good/test-trig-syntax-all-rules.trig b/test/extra/good/test-trig-syntax-all-rules.trig
index 97557b86..c824ffae 100644
--- a/test/extra/good/test-trig-syntax-all-rules.trig
+++ b/test/extra/good/test-trig-syntax-all-rules.trig

diff --git a/test/extra/good/test-true-ends-with-dot.nt b/test/extra/good/test-true-ends-with-dot.nt
new file mode 100644
index 00000000..9938065b
--- /dev/null
+++ b/test/extra/good/test-true-ends-with-dot.nt

diff --git a/test/extra/good/test-true-ends-with-dot.ttl b/test/extra/good/test-true-ends-with-dot.ttl
new file mode 100644
index 00000000..ebd3b6e1
--- /dev/null
+++ b/test/extra/good/test-true-ends-with-dot.ttl

diff --git a/test/extra/good/test-ttl-syntax-all-rules.ttl b/test/extra/good/test-ttl-syntax-all-rules.ttl
index ead2e8a8..dd4fa315 100644
--- a/test/extra/good/test-ttl-syntax-all-rules.ttl
+++ b/test/extra/good/test-ttl-syntax-all-rules.ttl