Clean up remaining stale test suite data

20 files changed, 307 insertions, 300 deletions

diff --git a/test/extra/bad/README.md b/test/extra/bad/README.md
new file mode 100644
index 00000000..32dce631
--- /dev/null
+++ b/test/extra/bad/README.md
@@ -0,0 +1,7 @@
+Bad Test Suite
+==============
+
+This suite contains tests that are "bad" in the sense that they are negative
+tests which contain errors the implementation must detect.  These tests have no
+results to compare, since parsing is expected to fail.  The implementation may
+emit some triples before failing, but this output is ignored.
diff --git a/test/extra/bad/bad-03.ttl b/test/extra/bad/bad-a-subject.ttl
index 07a372f1..07a372f1 100644
--- a/test/extra/bad/bad-03.ttl
+++ b/test/extra/bad/bad-a-subject.ttl
diff --git a/test/extra/bad/bad-01.ttl b/test/extra/bad/bad-blank-predicate.ttl
index 533bc21d..533bc21d 100644
--- a/test/extra/bad/bad-01.ttl
+++ b/test/extra/bad/bad-blank-predicate.ttl
diff --git a/test/extra/bad/bad-04.ttl b/test/extra/bad/bad-comma-in-collection.ttl
index ee7246c8..ee7246c8 100644
--- a/test/extra/bad/bad-04.ttl
+++ b/test/extra/bad/bad-comma-in-collection.ttl
diff --git a/test/extra/bad/invalid-char-in-local.ttl b/test/extra/bad/bad-disallowed-char-in-local.ttl
index 520c2404..520c2404 100644
--- a/test/extra/bad/invalid-char-in-local.ttl
+++ b/test/extra/bad/bad-disallowed-char-in-local.ttl
diff --git a/test/extra/bad/invalid-char-in-prefix.ttl b/test/extra/bad/bad-disallowed-char-in-prefix.ttl
index 79547803..79547803 100644
--- a/test/extra/bad/invalid-char-in-prefix.ttl
+++ b/test/extra/bad/bad-disallowed-char-in-prefix.ttl
diff --git a/test/extra/bad/bad-02.ttl b/test/extra/bad/bad-empty-blank-predicate.ttl
index fd2014d0..fd2014d0 100644
--- a/test/extra/bad/bad-02.ttl
+++ b/test/extra/bad/bad-empty-blank-predicate.ttl
diff --git a/test/extra/bad/bad-10.ttl b/test/extra/bad/bad-equivalence.ttl
index b5ef1f55..b5ef1f55 100644
--- a/test/extra/bad/bad-10.ttl
+++ b/test/extra/bad/bad-equivalence.ttl
diff --git a/test/extra/bad/bad-11.ttl b/test/extra/bad/bad-forAll.ttl
index 09e7b6a0..09e7b6a0 100644
--- a/test/extra/bad/bad-11.ttl
+++ b/test/extra/bad/bad-forAll.ttl
diff --git a/test/extra/bad/bad-12.ttl b/test/extra/bad/bad-forSome.ttl
index cef48ff8..cef48ff8 100644
--- a/test/extra/bad/bad-12.ttl
+++ b/test/extra/bad/bad-forSome.ttl
diff --git a/test/extra/bad/bad-05.ttl b/test/extra/bad/bad-graph-subject.ttl
index 387015fe..387015fe 100644
--- a/test/extra/bad/bad-05.ttl
+++ b/test/extra/bad/bad-graph-subject.ttl
diff --git a/test/extra/bad/bad-13.ttl b/test/extra/bad/bad-implied.ttl
index 91accf2b..91accf2b 100644
--- a/test/extra/bad/bad-13.ttl
+++ b/test/extra/bad/bad-implied.ttl
diff --git a/test/extra/bad/bad-09.ttl b/test/extra/bad/bad-implies.ttl
index d2d76c13..d2d76c13 100644
--- a/test/extra/bad/bad-09.ttl
+++ b/test/extra/bad/bad-implies.ttl
diff --git a/test/extra/bad/bad-06.ttl b/test/extra/bad/bad-is-of-keywords.ttl
index a8f1a0fc..a8f1a0fc 100644
--- a/test/extra/bad/bad-06.ttl
+++ b/test/extra/bad/bad-is-of-keywords.ttl
diff --git a/test/extra/bad/bad-08.ttl b/test/extra/bad/bad-keywords.ttl
index 07918f9a..07918f9a 100644
--- a/test/extra/bad/bad-08.ttl
+++ b/test/extra/bad/bad-keywords.ttl
diff --git a/test/extra/bad/bad-14.ttl b/test/extra/bad/bad-long-literal-missing-end.ttl
index f4a7acf5..f4a7acf5 100644
--- a/test/extra/bad/bad-14.ttl
+++ b/test/extra/bad/bad-long-literal-missing-end.ttl
diff --git a/test/extra/bad/bad-07.ttl b/test/extra/bad/bad-paths.ttl
index 18ea4fa6..18ea4fa6 100644
--- a/test/extra/bad/bad-07.ttl
+++ b/test/extra/bad/bad-paths.ttl
diff --git a/test/extra/bad/bad-00.ttl b/test/extra/bad/bad-prefix-missing-colon.ttl
index b1a1b361..b1a1b361 100644
--- a/test/extra/bad/bad-00.ttl
+++ b/test/extra/bad/bad-prefix-missing-colon.ttl
diff --git a/test/extra/bad/manifest.ttl b/test/extra/bad/manifest.ttl
index 05bcc69d..691969d9 100644
--- a/test/extra/bad/manifest.ttl
+++ b/test/extra/bad/manifest.ttl
@@ -1,38 +1,28 @@
 @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 ;
-	rdfs:comment "Serd bad syntax test cases" ;
+	a mf:Manifest ;
+	rdfs:comment "Serd bad (negative) test suite" ;
 	mf:entries (
-		<#bad-00>
-		<#bad-01>
-		<#bad-02>
-		<#bad-03>
-		<#bad-04>
-		<#bad-05>
-		<#bad-06>
-		<#bad-07>
-		<#bad-08>
-		<#bad-09>
-		<#bad-10>
-		<#bad-11>
-		<#bad-12>
-		<#bad-13>
-		<#bad-14>
+		<#bad-a-subject>
 		<#bad-base>
 		<#bad-blank>
+		<#bad-blank-predicate>
 		<#bad-blank-syntax>
 		<#bad-bom>
 		<#bad-char-in-local>
 		<#bad-char-in-prefix>
 		<#bad-char-in-uri>
-		<#bad-datatype-syntax>
+		<#bad-comma-in-collection>
 		<#bad-datatype>
+		<#bad-datatype-syntax>
+		<#bad-disallowed-char-in-local>
+		<#bad-disallowed-char-in-prefix>
 		<#bad-dot-after-subject>
 		<#bad-dot-in-collection>
+		<#bad-empty-blank-predicate>
 		<#bad-eof-after-quotes>
 		<#bad-eof-at-string-start>
 		<#bad-eof-in-blank>
@@ -40,410 +30,420 @@
 		<#bad-eof-in-lang-suffix>
 		<#bad-eof-in-lang>
 		<#bad-eof-in-list>
-		<#bad-eof-in-object-list2>
+		<#bad-eof-in-long-string>
 		<#bad-eof-in-object-list>
+		<#bad-eof-in-object-list2>
 		<#bad-eof-in-predicate-list>
-		<#bad-eof-in-long-string>
 		<#bad-eof-in-string>
+		<#bad-eof-in-text-character>
 		<#bad-eof-in-triple-quote>
 		<#bad-eof-in-uri>
+		<#bad-eof-in-uri-character>
 		<#bad-eof-in-uri-scheme>
+		<#bad-equivalence>
 		<#bad-escape>
 		<#bad-ext-namedblank-op>
+		<#bad-forAll>
+		<#bad-forSome>
 		<#bad-graph-blank-label>
+		<#bad-graph-subject>
 		<#bad-hex-digit>
 		<#bad-id-clash>
+		<#bad-implied>
+		<#bad-implies>
+		<#bad-is-of-keywords>
+		<#bad-keywords>
 		<#bad-lang>
-		<#bad-list2>
 		<#bad-list>
+		<#bad-list2>
 		<#bad-long-literal-in-list>
+		<#bad-long-literal-missing-end>
 		<#bad-missing-semi>
+		<#bad-missing-uri-scheme>
 		<#bad-misspelled-base>
 		<#bad-misspelled-prefix>
 		<#bad-namespace>
 		<#bad-ns>
 		<#bad-null-byte>
 		<#bad-num>
-		<#bad-object2>
 		<#bad-object>
+		<#bad-object2>
+		<#bad-paths>
 		<#bad-pn-escape>
+		<#bad-prefix-missing-colon>
 		<#bad-prefix>
 		<#bad-quote-in-uri>
 		<#bad-semicolon-after-subject>
 		<#bad-string>
 		<#bad-subject>
 		<#bad-uri-escape>
+		<#bad-uri-scheme>
+		<#bad-uri-scheme-start>
+		<#bad-uri-truncated>
 		<#bad-verb>
-		<#invalid-char-in-local>
-		<#invalid-char-in-prefix>
-		<#bad-missing-uri-scheme.nt>
-		<#bad-uri-scheme.nt>
-		<#bad-uri-scheme-start.nt>
-		<#bad-uri-truncated.nt>
 	) .
 
-<#bad-00>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-00" ;
-	mf:action <bad-00.ttl> .
-
-<#bad-01>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-01" ;
-	mf:action <bad-01.ttl> .
-
-<#bad-02>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-02" ;
-	mf:action <bad-02.ttl> .
-
-<#bad-03>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-03" ;
-	mf:action <bad-03.ttl> .
-
-<#bad-04>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-04" ;
-	mf:action <bad-04.ttl> .
-
-<#bad-05>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-05" ;
-	mf:action <bad-05.ttl> .
-
-<#bad-06>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-06" ;
-	mf:action <bad-06.ttl> .
-
-<#bad-07>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-07" ;
-	mf:action <bad-07.ttl> .
-
-<#bad-08>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-08" ;
-	mf:action <bad-08.ttl> .
-
-<#bad-09>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-09" ;
-	mf:action <bad-09.ttl> .
-
-<#bad-10>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-10" ;
-	mf:action <bad-10.ttl> .
-
-<#bad-11>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-11" ;
-	mf:action <bad-11.ttl> .
-
-<#bad-12>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-12" ;
-	mf:action <bad-12.ttl> .
-
-<#bad-13>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-13" ;
-	mf:action <bad-13.ttl> .
-
-<#bad-14>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-14" ;
-	mf:action <bad-14.ttl> .
+<#bad-a-subject>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-a-subject.ttl> ;
+	mf:name "bad-a-subject" .
 
 <#bad-base>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-base" ;
-	mf:action <bad-base.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-base.ttl> ;
+	mf:name "bad-base" .
 
 <#bad-blank>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-blank" ;
-	mf:action <bad-blank.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-blank.ttl> ;
+	mf:name "bad-blank" .
+
+<#bad-blank-predicate>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-blank-predicate.ttl> ;
+	mf:name "bad-blank-predicate" .
 
 <#bad-blank-syntax>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-blank-syntax" ;
-	mf:action <bad-blank-syntax.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-blank-syntax.ttl> ;
+	mf:name "bad-blank-syntax" .
 
 <#bad-bom>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-bom" ;
-	mf:action <bad-bom.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-bom.ttl> ;
+	mf:name "bad-bom" .
 
 <#bad-char-in-local>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-char-in-local" ;
-	mf:action <bad-char-in-local.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-char-in-local.ttl> ;
+	mf:name "bad-char-in-local" .
 
 <#bad-char-in-prefix>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-char-in-prefix" ;
-	mf:action <bad-char-in-prefix.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-char-in-prefix.ttl> ;
+	mf:name "bad-char-in-prefix" .
 
 <#bad-char-in-uri>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-char-in-uri" ;
-	mf:action <bad-char-in-uri.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-char-in-uri.ttl> ;
+	mf:name "bad-char-in-uri" .
 
-<#bad-datatype-syntax>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-datatype-syntax" ;
-	mf:action <bad-datatype-syntax.ttl> .
+<#bad-comma-in-collection>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-comma-in-collection.ttl> ;
+	mf:name "bad-comma-in-collection" .
 
 <#bad-datatype>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-datatype" ;
-	mf:action <bad-datatype.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-datatype.ttl> ;
+	mf:name "bad-datatype" .
+
+<#bad-datatype-syntax>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-datatype-syntax.ttl> ;
+	mf:name "bad-datatype-syntax" .
+
+<#bad-disallowed-char-in-local>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-disallowed-char-in-local.ttl> ;
+	mf:name "bad-disallowed-char-in-local" .
+
+<#bad-disallowed-char-in-prefix>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-disallowed-char-in-prefix.ttl> ;
+	mf:name "bad-disallowed-char-in-prefix" .
 
 <#bad-dot-after-subject>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-dot-after-subject" ;
-	mf:action <bad-dot-after-subject.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-dot-after-subject.ttl> ;
+	mf:name "bad-dot-after-subject" .
 
 <#bad-dot-in-collection>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-dot-in-collection" ;
-	mf:action <bad-dot-in-collection.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-dot-in-collection.ttl> ;
+	mf:name "bad-dot-in-collection" .
+
+<#bad-empty-blank-predicate>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-empty-blank-predicate.ttl> ;
+	mf:name "bad-empty-blank-predicate" .
 
 <#bad-eof-after-quotes>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-after-quotes" ;
-	mf:action <bad-eof-after-quotes.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-after-quotes.ttl> ;
+	mf:name "bad-eof-after-quotes" .
 
 <#bad-eof-at-string-start>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-at-string-start" ;
-	mf:action <bad-eof-at-string-start.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-at-string-start.ttl> ;
+	mf:name "bad-eof-at-string-start" .
 
 <#bad-eof-in-blank>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-blank" ;
-	mf:action <bad-eof-in-blank.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-blank.ttl> ;
+	mf:name "bad-eof-in-blank" .
 
 <#bad-eof-in-escape>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-escape" ;
-	mf:action <bad-eof-in-escape.ttl> .
-
-<#bad-eof-in-lang-suffix>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-lang-suffix" ;
-	mf:action <bad-eof-in-lang-suffix.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-escape.ttl> ;
+	mf:name "bad-eof-in-escape" .
 
 <#bad-eof-in-lang>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-lang" ;
-	mf:action <bad-eof-in-lang.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-lang.ttl> ;
+	mf:name "bad-eof-in-lang" .
+
+<#bad-eof-in-lang-suffix>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-lang-suffix.ttl> ;
+	mf:name "bad-eof-in-lang-suffix" .
 
 <#bad-eof-in-list>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-list" ;
-	mf:action <bad-eof-in-list.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-list.ttl> ;
+	mf:name "bad-eof-in-list" .
 
-<#bad-eof-in-object-list2>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-object-list2" ;
-	mf:action <bad-eof-in-object-list2.ttl> .
+<#bad-eof-in-long-string>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-long-string.ttl> ;
+	mf:name "bad-eof-in-long-string" .
 
 <#bad-eof-in-object-list>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-object-list" ;
-	mf:action <bad-eof-in-object-list.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-object-list.ttl> ;
+	mf:name "bad-eof-in-object-list" .
 
-<#bad-eof-in-predicate-list>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-predicate-list" ;
-	mf:action <bad-eof-in-predicate-list.ttl> .
+<#bad-eof-in-object-list2>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-object-list2.ttl> ;
+	mf:name "bad-eof-in-object-list2" .
 
-<#bad-eof-in-long-string>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-long-string" ;
-	mf:action <bad-eof-in-long-string.ttl> .
+<#bad-eof-in-predicate-list>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-predicate-list.ttl> ;
+	mf:name "bad-eof-in-predicate-list" .
 
 <#bad-eof-in-string>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-string" ;
-	mf:action <bad-eof-in-string.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-string.ttl> ;
+	mf:name "bad-eof-in-string" .
 
 <#bad-eof-in-triple-quote>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-triple-quote" ;
-	mf:action <bad-eof-in-triple-quote.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-triple-quote.ttl> ;
+	mf:name "bad-eof-in-triple-quote" .
 
 <#bad-eof-in-uri>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-eof-in-uri" ;
-	mf:action <bad-eof-in-uri.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-eof-in-uri.ttl> ;
+	mf:name "bad-eof-in-uri" .
 
 <#bad-eof-in-uri-scheme>
-	rdf:type rdft:TestNTriplesNegativeSyntax ;
-	mf:name "bad-eof-in-uri-scheme" ;
-	mf:action <bad-eof-in-uri-scheme.nt> .
+	a rdft:TestNTriplesNegativeSyntax ;
+	mf:action <bad-eof-in-uri-scheme.nt> ;
+	mf:name "bad-eof-in-uri-scheme" .
+
+<#bad-equivalence>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-equivalence.ttl> ;
+	mf:name "bad-equivalence" .
 
 <#bad-escape>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-escape" ;
-	mf:action <bad-escape.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-escape.ttl> ;
+	mf:name "bad-escape" .
 
 <#bad-ext-namedblank-op>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-ext-namedblank-op" ;
-	mf:action <bad-ext-namedblank-op.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-ext-namedblank-op.ttl> ;
+	mf:name "bad-ext-namedblank-op" .
+
+<#bad-forAll>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-forAll.ttl> ;
+	mf:name "bad-forAll" .
+
+<#bad-forSome>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-forSome.ttl> ;
+	mf:name "bad-forSome" .
 
 <#bad-graph-blank-label>
-	rdf:type rdft:TestTrigNegativeSyntax ;
-	mf:name "bad-graph-blank-label" ;
-	mf:action <bad-graph-blank-label.trig> .
+	a rdft:TestTrigNegativeSyntax ;
+	mf:action <bad-graph-blank-label.trig> ;
+	mf:name "bad-graph-blank-label" .
+
+<#bad-graph-subject>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-graph-subject.ttl> ;
+	mf:name "bad-graph-subject" .
 
 <#bad-hex-digit>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-hex-digit" ;
-	mf:action <bad-hex-digit.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-hex-digit.ttl> ;
+	mf:name "bad-hex-digit" .
 
 <#bad-id-clash>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-id-clash" ;
-	mf:action <bad-id-clash.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-id-clash.ttl> ;
+	mf:name "bad-id-clash" .
+
+<#bad-implied>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-implied.ttl> ;
+	mf:name "bad-implied" .
+
+<#bad-implies>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-implies.ttl> ;
+	mf:name "bad-implies" .
+
+<#bad-is-of-keywords>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-is-of-keywords.ttl> ;
+	mf:name "bad-is-of-keywords" .
+
+<#bad-keywords>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-keywords.ttl> ;
+	mf:name "bad-keywords" .
 
 <#bad-lang>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-lang" ;
-	mf:action <bad-lang.ttl> .
-
-<#bad-list2>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-list2" ;
-	mf:action <bad-list2.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-lang.ttl> ;
+	mf:name "bad-lang" .
 
 <#bad-list>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-list" ;
-	mf:action <bad-list.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-list.ttl> ;
+	mf:name "bad-list" .
+
+<#bad-list2>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-list2.ttl> ;
+	mf:name "bad-list2" .
 
 <#bad-long-literal-in-list>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-long-literal-in-list" ;
-	mf:action <bad-long-literal-in-list.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-long-literal-in-list.ttl> ;
+	mf:name "bad-long-literal-in-list" .
+
+<#bad-long-literal-missing-end>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-long-literal-missing-end.ttl> ;
+	mf:name "bad-long-literal-missing-end" .
 
 <#bad-missing-semi>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-missing-semi" ;
-	mf:action <bad-missing-semi.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-missing-semi.ttl> ;
+	mf:name "bad-missing-semi" .
+
+<#bad-missing-uri-scheme>
+	a rdft:TestNTriplesNegativeSyntax ;
+	mf:action <bad-missing-uri-scheme.nt> ;
+	mf:name "bad-missing-uri-scheme" .
 
 <#bad-misspelled-base>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-misspelled-base" ;
-	mf:action <bad-misspelled-base.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-misspelled-base.ttl> ;
+	mf:name "bad-misspelled-base" .
 
 <#bad-misspelled-prefix>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-misspelled-prefix" ;
-	mf:action <bad-misspelled-prefix.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-misspelled-prefix.ttl> ;
+	mf:name "bad-misspelled-prefix" .
 
 <#bad-namespace>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-namespace" ;
-	mf:action <bad-namespace.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-namespace.ttl> ;
+	mf:name "bad-namespace" .
 
 <#bad-ns>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-ns" ;
-	mf:action <bad-ns.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-ns.ttl> ;
+	mf:name "bad-ns" .
 
 <#bad-null-byte>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-null-byte" ;
-	mf:action <bad-null-byte.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-null-byte.ttl> ;
+	mf:name "bad-null-byte" .
 
 <#bad-num>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-num" ;
-	mf:action <bad-num.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-num.ttl> ;
+	mf:name "bad-num" .
+
+<#bad-object>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-object.ttl> ;
+	mf:name "bad-object" .
 
 <#bad-object2>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-object2" ;
-	mf:action <bad-object2.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-object2.ttl> ;
+	mf:name "bad-object2" .
 
-<#bad-object>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-object" ;
-	mf:action <bad-object.ttl> .
+<#bad-paths>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-paths.ttl> ;
+	mf:name "bad-paths" .
 
 <#bad-pn-escape>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-pn-escape" ;
-	mf:action <bad-pn-escape.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-pn-escape.ttl> ;
+	mf:name "bad-pn-escape" .
 
 <#bad-prefix>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-prefix" ;
-	mf:action <bad-prefix.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-prefix.ttl> ;
+	mf:name "bad-prefix" .
+
+<#bad-prefix-missing-colon>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-prefix-missing-colon.ttl> ;
+	mf:name "bad-prefix-missing-colon" .
 
 <#bad-quote-in-uri>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-quote-in-uri" ;
-	mf:action <bad-quote-in-uri.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-quote-in-uri.ttl> ;
+	mf:name "bad-quote-in-uri" .
 
 <#bad-semicolon-after-subject>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-semicolon-after-subject" ;
-	mf:action <bad-semicolon-after-subject.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-semicolon-after-subject.ttl> ;
+	mf:name "bad-semicolon-after-subject" .
 
 <#bad-string>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-string" ;
-	mf:action <bad-string.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-string.ttl> ;
+	mf:name "bad-string" .
 
 <#bad-subject>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-subject" ;
-	mf:action <bad-subject.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-subject.ttl> ;
+	mf:name "bad-subject" .
 
 <#bad-uri-escape>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-uri-escape" ;
-	mf:action <bad-uri-escape.ttl> .
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-uri-escape.ttl> ;
+	mf:name "bad-uri-escape" .
 
-<#bad-verb>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "bad-verb" ;
-	mf:action <bad-verb.ttl> .
-
-<#invalid-char-in-local>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "invalid-char-in-local" ;
-	mf:action <invalid-char-in-local.ttl> .
-
-<#invalid-char-in-prefix>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
-	mf:name "invalid-char-in-prefix" ;
-	mf:action <invalid-char-in-prefix.ttl> .
-
-<#bad-missing-uri-scheme.nt>
-	rdf:type rdft:TestNTriplesNegativeSyntax ;
-	mf:name "bad-missing-uri-scheme" ;
-	mf:action <bad-missing-uri-scheme.nt> .
-
-<#bad-uri-scheme.nt>
-	rdf:type rdft:TestNTriplesNegativeSyntax ;
-	mf:name "bad-uri-scheme" ;
-	mf:action <bad-uri-scheme.nt> .
-
-<#bad-uri-scheme-start.nt>
-	rdf:type rdft:TestNTriplesNegativeSyntax ;
-	mf:name "bad-uri-scheme-start" ;
-	mf:action <bad-uri-scheme-start.nt> .
-
-<#bad-uri-truncated.nt>
-	rdf:type rdft:TestNTriplesNegativeSyntax ;
-	mf:name "bad-uri-truncated" ;
-	mf:action <bad-uri-truncated.nt> .
+<#bad-uri-scheme>
+	a rdft:TestNTriplesNegativeSyntax ;
+	mf:action <bad-uri-scheme.nt> ;
+	mf:name "bad-uri-scheme" .
+
+<#bad-uri-scheme-start>
+	a rdft:TestNTriplesNegativeSyntax ;
+	mf:action <bad-uri-scheme-start.nt> ;
+	mf:name "bad-uri-scheme-start" .
 
+<#bad-uri-truncated>
+	a rdft:TestNTriplesNegativeSyntax ;
+	mf:action <bad-uri-truncated.nt> ;
+	mf:name "bad-uri-truncated" .
+
+<#bad-verb>
+	a rdft:TestTurtleNegativeSyntax ;
+	mf:action <bad-verb.ttl> ;
+	mf:name "bad-verb" .
diff --git a/test/extra/lax/manifest.ttl b/test/extra/lax/manifest.ttl
index 5d220daf..e2930a81 100644
--- a/test/extra/lax/manifest.ttl
+++ b/test/extra/lax/manifest.ttl
@@ -4,7 +4,7 @@
 
 <>
 	a mf:Manifest ;
-	rdfs:comment "Serd lax syntax test cases" ;
+	rdfs:comment "Serd lax parsing test suite" ;
 	mf:entries (
 		<#test-bad-string>
 		<#test-bad-uri>