124 files changed, 86 insertions, 71 deletions
diff --git a/tests/README.txt b/tests/good/README.txt
index 37460e60..37460e60 100644
--- a/tests/README.txt
+++ b/tests/good/README.txt
diff --git a/tests/UTF-8.nt b/tests/good/UTF-8.nt
index ab2fd721..ab2fd721 100644
--- a/tests/UTF-8.nt
+++ b/tests/good/UTF-8.nt
diff --git a/tests/UTF-8.ttl b/tests/good/UTF-8.ttl
index 82587c57..82587c57 100644
--- a/tests/UTF-8.ttl
+++ b/tests/good/UTF-8.ttl
diff --git a/tests/base.nt b/tests/good/base.nt
index abfc02b5..abfc02b5 100644
--- a/tests/base.nt
+++ b/tests/good/base.nt
diff --git a/tests/base.ttl b/tests/good/base.ttl
index 755c1d09..755c1d09 100644
--- a/tests/base.ttl
+++ b/tests/good/base.ttl
diff --git a/tests/manifest.nt b/tests/good/manifest.nt
index 123a38b5..123a38b5 100644
--- a/tests/manifest.nt
+++ b/tests/good/manifest.nt
diff --git a/tests/manifest.ttl b/tests/good/manifest.ttl
index 6a2cae26..6a2cae26 100644
--- a/tests/manifest.ttl
+++ b/tests/good/manifest.ttl
diff --git a/tests/rdf-schema.nt b/tests/good/rdf-schema.nt
index 94e14045..94e14045 100644
--- a/tests/rdf-schema.nt
+++ b/tests/good/rdf-schema.nt
diff --git a/tests/rdf-schema.ttl b/tests/good/rdf-schema.ttl
index 8a61794e..8a61794e 100644
--- a/tests/rdf-schema.ttl
+++ b/tests/good/rdf-schema.ttl
diff --git a/tests/rdfs-namespace.nt b/tests/good/rdfs-namespace.nt
index 4696f8cf..4696f8cf 100644
--- a/tests/rdfs-namespace.nt
+++ b/tests/good/rdfs-namespace.nt
diff --git a/tests/rdfs-namespace.ttl b/tests/good/rdfs-namespace.ttl
index 0d73e6bf..0d73e6bf 100644
--- a/tests/rdfs-namespace.ttl
+++ b/tests/good/rdfs-namespace.ttl
diff --git a/tests/test-00.nt b/tests/good/test-00.nt
index d1d84a2d..d1d84a2d 100644
--- a/tests/test-00.nt
+++ b/tests/good/test-00.nt
diff --git a/tests/test-00.ttl b/tests/good/test-00.ttl
index 78da35e6..78da35e6 100644
--- a/tests/test-00.ttl
+++ b/tests/good/test-00.ttl
diff --git a/tests/test-01.nt b/tests/good/test-01.nt
index 5ccb5bd2..5ccb5bd2 100644
--- a/tests/test-01.nt
+++ b/tests/good/test-01.nt
diff --git a/tests/test-01.ttl b/tests/good/test-01.ttl
index 9070d2c4..9070d2c4 100644
--- a/tests/test-01.ttl
+++ b/tests/good/test-01.ttl
diff --git a/tests/test-02.nt b/tests/good/test-02.nt
index 99732ab3..99732ab3 100644
--- a/tests/test-02.nt
+++ b/tests/good/test-02.nt
diff --git a/tests/test-02.ttl b/tests/good/test-02.ttl
index a623f3c1..a623f3c1 100644
--- a/tests/test-02.ttl
+++ b/tests/good/test-02.ttl
diff --git a/tests/test-03.nt b/tests/good/test-03.nt
index d6ce9e8f..d6ce9e8f 100644
--- a/tests/test-03.nt
+++ b/tests/good/test-03.nt
diff --git a/tests/test-03.ttl b/tests/good/test-03.ttl
index 9179fa50..9179fa50 100644
--- a/tests/test-03.ttl
+++ b/tests/good/test-03.ttl
diff --git a/tests/test-04.nt b/tests/good/test-04.nt
index d5d01526..d5d01526 100644
--- a/tests/test-04.nt
+++ b/tests/good/test-04.nt
diff --git a/tests/test-04.ttl b/tests/good/test-04.ttl
index c5181479..c5181479 100644
--- a/tests/test-04.ttl
+++ b/tests/good/test-04.ttl
diff --git a/tests/test-05.nt b/tests/good/test-05.nt
index d440197f..d440197f 100644
--- a/tests/test-05.nt
+++ b/tests/good/test-05.nt
diff --git a/tests/test-05.ttl b/tests/good/test-05.ttl
index adcbcabd..adcbcabd 100644
--- a/tests/test-05.ttl
+++ b/tests/good/test-05.ttl
diff --git a/tests/test-06.nt b/tests/good/test-06.nt
index 49961ea6..49961ea6 100644
--- a/tests/test-06.nt
+++ b/tests/good/test-06.nt
diff --git a/tests/test-06.ttl b/tests/good/test-06.ttl
index 9c1005cc..9c1005cc 100644
--- a/tests/test-06.ttl
+++ b/tests/good/test-06.ttl
diff --git a/tests/test-07.nt b/tests/good/test-07.nt
index 923f26a4..923f26a4 100644
--- a/tests/test-07.nt
+++ b/tests/good/test-07.nt
diff --git a/tests/test-07.ttl b/tests/good/test-07.ttl
index 84559403..84559403 100644
--- a/tests/test-07.ttl
+++ b/tests/good/test-07.ttl
diff --git a/tests/test-08.nt b/tests/good/test-08.nt
index a77939cd..a77939cd 100644
--- a/tests/test-08.nt
+++ b/tests/good/test-08.nt
diff --git a/tests/test-08.ttl b/tests/good/test-08.ttl
index adce0a20..adce0a20 100644
--- a/tests/test-08.ttl
+++ b/tests/good/test-08.ttl
diff --git a/tests/test-09.nt b/tests/good/test-09.nt
index c7164085..c7164085 100644
--- a/tests/test-09.nt
+++ b/tests/good/test-09.nt
diff --git a/tests/test-09.ttl b/tests/good/test-09.ttl
index 0afe1b0a..0afe1b0a 100644
--- a/tests/test-09.ttl
+++ b/tests/good/test-09.ttl
diff --git a/tests/test-10.nt b/tests/good/test-10.nt
index ff88aa6f..ff88aa6f 100644
--- a/tests/test-10.nt
+++ b/tests/good/test-10.nt
diff --git a/tests/test-10.ttl b/tests/good/test-10.ttl
index 5d36360e..5d36360e 100644
--- a/tests/test-10.ttl
+++ b/tests/good/test-10.ttl
diff --git a/tests/test-11.nt b/tests/good/test-11.nt
index f936a5b6..f936a5b6 100644
--- a/tests/test-11.nt
+++ b/tests/good/test-11.nt
diff --git a/tests/test-11.ttl b/tests/good/test-11.ttl
index 3de1a43f..3de1a43f 100644
--- a/tests/test-11.ttl
+++ b/tests/good/test-11.ttl
diff --git a/tests/test-12.nt b/tests/good/test-12.nt
index 67404a59..67404a59 100644
--- a/tests/test-12.nt
+++ b/tests/good/test-12.nt
diff --git a/tests/test-12.ttl b/tests/good/test-12.ttl
index 1fed9f5e..1fed9f5e 100644
--- a/tests/test-12.ttl
+++ b/tests/good/test-12.ttl
diff --git a/tests/test-13.nt b/tests/good/test-13.nt
index 195a1af7..195a1af7 100644
--- a/tests/test-13.nt
+++ b/tests/good/test-13.nt
diff --git a/tests/test-13.ttl b/tests/good/test-13.ttl
index a8be95be..a8be95be 100644
--- a/tests/test-13.ttl
+++ b/tests/good/test-13.ttl
diff --git a/tests/test-14.nt b/tests/good/test-14.nt
index 791b3a7a..791b3a7a 100644
--- a/tests/test-14.nt
+++ b/tests/good/test-14.nt
diff --git a/tests/test-14.ttl b/tests/good/test-14.ttl
index ad9dbde8..ad9dbde8 100644
--- a/tests/test-14.ttl
+++ b/tests/good/test-14.ttl
diff --git a/tests/test-15.nt b/tests/good/test-15.nt
index c0604b3b..c0604b3b 100644
--- a/tests/test-15.nt
+++ b/tests/good/test-15.nt
diff --git a/tests/test-15.ttl b/tests/good/test-15.ttl
index 10df17df..10df17df 100644
--- a/tests/test-15.ttl
+++ b/tests/good/test-15.ttl
diff --git a/tests/test-16.nt b/tests/good/test-16.nt
index c0604b3b..c0604b3b 100644
--- a/tests/test-16.nt
+++ b/tests/good/test-16.nt
diff --git a/tests/test-16.ttl b/tests/good/test-16.ttl
index a9ac37fb..a9ac37fb 100644
--- a/tests/test-16.ttl
+++ b/tests/good/test-16.ttl
diff --git a/tests/test-17.nt b/tests/good/test-17.nt
index 466edbb2..466edbb2 100644
--- a/tests/test-17.nt
+++ b/tests/good/test-17.nt
diff --git a/tests/test-17.ttl b/tests/good/test-17.ttl
index 86c453bd..86c453bd 100644
--- a/tests/test-17.ttl
+++ b/tests/good/test-17.ttl
diff --git a/tests/test-18.nt b/tests/good/test-18.nt
index 4ff4b95b..4ff4b95b 100644
--- a/tests/test-18.nt
+++ b/tests/good/test-18.nt
diff --git a/tests/test-18.ttl b/tests/good/test-18.ttl
index 1adfa451..1adfa451 100644
--- a/tests/test-18.ttl
+++ b/tests/good/test-18.ttl
diff --git a/tests/test-19.nt b/tests/good/test-19.nt
index 2e2dbe40..2e2dbe40 100644
--- a/tests/test-19.nt
+++ b/tests/good/test-19.nt
diff --git a/tests/test-19.ttl b/tests/good/test-19.ttl
index 9de0c07b..9de0c07b 100644
--- a/tests/test-19.ttl
+++ b/tests/good/test-19.ttl
diff --git a/tests/test-20.nt b/tests/good/test-20.nt
index fff2da56..fff2da56 100644
--- a/tests/test-20.nt
+++ b/tests/good/test-20.nt
diff --git a/tests/test-20.ttl b/tests/good/test-20.ttl
index 37a9a4f3..37a9a4f3 100644
--- a/tests/test-20.ttl
+++ b/tests/good/test-20.ttl
diff --git a/tests/test-21.nt b/tests/good/test-21.nt
index d5dca690..d5dca690 100644
--- a/tests/test-21.nt
+++ b/tests/good/test-21.nt
diff --git a/tests/test-21.ttl b/tests/good/test-21.ttl
index a8e8dc15..a8e8dc15 100644
--- a/tests/test-21.ttl
+++ b/tests/good/test-21.ttl
diff --git a/tests/test-22.nt b/tests/good/test-22.nt
index 3d0f970e..3d0f970e 100644
--- a/tests/test-22.nt
+++ b/tests/good/test-22.nt
diff --git a/tests/test-22.ttl b/tests/good/test-22.ttl
index 9b1a725a..9b1a725a 100644
--- a/tests/test-22.ttl
+++ b/tests/good/test-22.ttl
diff --git a/tests/test-23.nt b/tests/good/test-23.nt
index fde31312..fde31312 100644
--- a/tests/test-23.nt
+++ b/tests/good/test-23.nt
diff --git a/tests/test-23.ttl b/tests/good/test-23.ttl
index 9f5360af..9f5360af 100644
--- a/tests/test-23.ttl
+++ b/tests/good/test-23.ttl
diff --git a/tests/test-24.nt b/tests/good/test-24.nt
index 5a70bff1..5a70bff1 100644
--- a/tests/test-24.nt
+++ b/tests/good/test-24.nt
diff --git a/tests/test-24.ttl b/tests/good/test-24.ttl
index 25f3b757..25f3b757 100644
--- a/tests/test-24.ttl
+++ b/tests/good/test-24.ttl
diff --git a/tests/test-25.nt b/tests/good/test-25.nt
index 1a38415f..1a38415f 100644
--- a/tests/test-25.nt
+++ b/tests/good/test-25.nt
diff --git a/tests/test-25.ttl b/tests/good/test-25.ttl
index 310349da..310349da 100644
--- a/tests/test-25.ttl
+++ b/tests/good/test-25.ttl
diff --git a/tests/test-26.nt b/tests/good/test-26.nt
index ad105cf4..ad105cf4 100644
--- a/tests/test-26.nt
+++ b/tests/good/test-26.nt
diff --git a/tests/test-26.ttl b/tests/good/test-26.ttl
index 0667c6b4..0667c6b4 100644
--- a/tests/test-26.ttl
+++ b/tests/good/test-26.ttl
diff --git a/tests/test-27.nt b/tests/good/test-27.nt
index 7da0635b..7da0635b 100644
--- a/tests/test-27.nt
+++ b/tests/good/test-27.nt
diff --git a/tests/test-27.ttl b/tests/good/test-27.ttl
index 569023c8..569023c8 100644
--- a/tests/test-27.ttl
+++ b/tests/good/test-27.ttl
diff --git a/tests/test-29.nt b/tests/good/test-29.nt
index 612052d3..612052d3 100644
--- a/tests/test-29.nt
+++ b/tests/good/test-29.nt
diff --git a/tests/test-29.ttl b/tests/good/test-29.ttl
index 612052d3..612052d3 100644
--- a/tests/test-29.ttl
+++ b/tests/good/test-29.ttl
diff --git a/tests/test-30.nt b/tests/good/test-30.nt
index ce5c67d0..ce5c67d0 100644
--- a/tests/test-30.nt
+++ b/tests/good/test-30.nt
diff --git a/tests/test-30.ttl b/tests/good/test-30.ttl
index 6721ec24..6721ec24 100644
--- a/tests/test-30.ttl
+++ b/tests/good/test-30.ttl
diff --git a/tests/test-backspace.nt b/tests/good/test-backspace.nt
index ad4806cf..ad4806cf 100644
--- a/tests/test-backspace.nt
+++ b/tests/good/test-backspace.nt
diff --git a/tests/test-backspace.ttl b/tests/good/test-backspace.ttl
index 07375d76..07375d76 100644
--- a/tests/test-backspace.ttl
+++ b/tests/good/test-backspace.ttl
diff --git a/tests/test-bad-utf8.nt b/tests/good/test-bad-utf8.nt
index 6d73993d..6d73993d 100644
--- a/tests/test-bad-utf8.nt
+++ b/tests/good/test-bad-utf8.nt
diff --git a/tests/test-bad-utf8.ttl b/tests/good/test-bad-utf8.ttl
index 2c105f5b..2c105f5b 100644
--- a/tests/test-bad-utf8.ttl
+++ b/tests/good/test-bad-utf8.ttl
diff --git a/tests/test-base-query.nt b/tests/good/test-base-query.nt
index d40c2f6b..d40c2f6b 100644
--- a/tests/test-base-query.nt
+++ b/tests/good/test-base-query.nt
diff --git a/tests/test-base-query.ttl b/tests/good/test-base-query.ttl
index 77638817..77638817 100644
--- a/tests/test-base-query.ttl
+++ b/tests/good/test-base-query.ttl
diff --git a/tests/test-blank-cont.nt b/tests/good/test-blank-cont.nt
index a4b44e7d..a4b44e7d 100644
--- a/tests/test-blank-cont.nt
+++ b/tests/good/test-blank-cont.nt
diff --git a/tests/test-blank-cont.ttl b/tests/good/test-blank-cont.ttl
index b161cdc4..b161cdc4 100644
--- a/tests/test-blank-cont.ttl
+++ b/tests/good/test-blank-cont.ttl
diff --git a/tests/test-blank-in-list.nt b/tests/good/test-blank-in-list.nt
index 253087e7..253087e7 100644
--- a/tests/test-blank-in-list.nt
+++ b/tests/good/test-blank-in-list.nt
diff --git a/tests/test-blank-in-list.ttl b/tests/good/test-blank-in-list.ttl
index 5c0b0766..5c0b0766 100644
--- a/tests/test-blank-in-list.ttl
+++ b/tests/good/test-blank-in-list.ttl
diff --git a/tests/test-bom.nt b/tests/good/test-bom.nt
index aea1655b..aea1655b 100644
--- a/tests/test-bom.nt
+++ b/tests/good/test-bom.nt
diff --git a/tests/test-bom.ttl b/tests/good/test-bom.ttl
index 8d6534e1..8d6534e1 100644
--- a/tests/test-bom.ttl
+++ b/tests/good/test-bom.ttl
diff --git a/tests/test-cr.nt b/tests/good/test-cr.nt
index aea1655b..aea1655b 100644
--- a/tests/test-cr.nt
+++ b/tests/good/test-cr.nt
diff --git a/tests/test-cr.ttl b/tests/good/test-cr.ttl
index 5410648a..5410648a 100644
--- a/tests/test-cr.ttl
+++ b/tests/good/test-cr.ttl
diff --git a/tests/test-delete.nt b/tests/good/test-delete.nt
index 41ac8062..41ac8062 100644
--- a/tests/test-delete.nt
+++ b/tests/good/test-delete.nt
diff --git a/tests/test-delete.ttl b/tests/good/test-delete.ttl
index 4bc97060..4bc97060 100644
--- a/tests/test-delete.ttl
+++ b/tests/good/test-delete.ttl
diff --git a/tests/test-digit-start-pname.nt b/tests/good/test-digit-start-pname.nt
index 66eab7db..66eab7db 100644
--- a/tests/test-digit-start-pname.nt
+++ b/tests/good/test-digit-start-pname.nt
diff --git a/tests/test-digit-start-pname.ttl b/tests/good/test-digit-start-pname.ttl
index 6ca8ade8..6ca8ade8 100644
--- a/tests/test-digit-start-pname.ttl
+++ b/tests/good/test-digit-start-pname.ttl
diff --git a/tests/test-eof-at-page-end.nt b/tests/good/test-eof-at-page-end.nt
index 64d24586..64d24586 100644
--- a/tests/test-eof-at-page-end.nt
+++ b/tests/good/test-eof-at-page-end.nt
diff --git a/tests/test-eof-at-page-end.ttl b/tests/good/test-eof-at-page-end.ttl
index d6d9af26..d6d9af26 100644
--- a/tests/test-eof-at-page-end.ttl
+++ b/tests/good/test-eof-at-page-end.ttl
diff --git a/tests/test-escapes.nt b/tests/good/test-escapes.nt
index 725b832c..725b832c 100644
--- a/tests/test-escapes.nt
+++ b/tests/good/test-escapes.nt
diff --git a/tests/test-escapes.ttl b/tests/good/test-escapes.ttl
index ff306b15..ff306b15 100644
--- a/tests/test-escapes.ttl
+++ b/tests/good/test-escapes.ttl
diff --git a/tests/test-id.nt b/tests/good/test-id.nt
index b4b11069..b4b11069 100644
--- a/tests/test-id.nt
+++ b/tests/good/test-id.nt
diff --git a/tests/test-id.ttl b/tests/good/test-id.ttl
index cfd0e9ca..cfd0e9ca 100644
--- a/tests/test-id.ttl
+++ b/tests/good/test-id.ttl
diff --git a/tests/test-lang.nt b/tests/good/test-lang.nt
index 61daecb3..61daecb3 100644
--- a/tests/test-lang.nt
+++ b/tests/good/test-lang.nt
diff --git a/tests/test-lang.ttl b/tests/good/test-lang.ttl
index b0616475..b0616475 100644
--- a/tests/test-lang.ttl
+++ b/tests/good/test-lang.ttl
diff --git a/tests/test-list-in-blank.nt b/tests/good/test-list-in-blank.nt
index b7f631da..b7f631da 100644
--- a/tests/test-list-in-blank.nt
+++ b/tests/good/test-list-in-blank.nt
diff --git a/tests/test-list-in-blank.ttl b/tests/good/test-list-in-blank.ttl
index bdf75fce..bdf75fce 100644
--- a/tests/test-list-in-blank.ttl
+++ b/tests/good/test-list-in-blank.ttl
diff --git a/tests/test-list-subject.nt b/tests/good/test-list-subject.nt
index ef87b0f2..ef87b0f2 100644
--- a/tests/test-list-subject.nt
+++ b/tests/good/test-list-subject.nt
diff --git a/tests/test-list-subject.ttl b/tests/good/test-list-subject.ttl
index 5cd81dfb..5cd81dfb 100644
--- a/tests/test-list-subject.ttl
+++ b/tests/good/test-list-subject.ttl
diff --git a/tests/test-list.nt b/tests/good/test-list.nt
index 3a27a5a6..3a27a5a6 100644
--- a/tests/test-list.nt
+++ b/tests/good/test-list.nt
diff --git a/tests/test-list.ttl b/tests/good/test-list.ttl
index 7f4c7699..7f4c7699 100644
--- a/tests/test-list.ttl
+++ b/tests/good/test-list.ttl
diff --git a/tests/test-long-string.nt b/tests/good/test-long-string.nt
index ba6be49c..ba6be49c 100644
--- a/tests/test-long-string.nt
+++ b/tests/good/test-long-string.nt
diff --git a/tests/test-long-string.ttl b/tests/good/test-long-string.ttl
index 7da44b4b..7da44b4b 100644
--- a/tests/test-long-string.ttl
+++ b/tests/good/test-long-string.ttl
diff --git a/tests/test-no-spaces.nt b/tests/good/test-no-spaces.nt
index 3619a5f0..3619a5f0 100644
--- a/tests/test-no-spaces.nt
+++ b/tests/good/test-no-spaces.nt
diff --git a/tests/test-no-spaces.ttl b/tests/good/test-no-spaces.ttl
index 88171e71..88171e71 100644
--- a/tests/test-no-spaces.ttl
+++ b/tests/good/test-no-spaces.ttl
diff --git a/tests/test-num.nt b/tests/good/test-num.nt
index 54263d46..54263d46 100644
--- a/tests/test-num.nt
+++ b/tests/good/test-num.nt
diff --git a/tests/test-num.ttl b/tests/good/test-num.ttl
index 68ad290b..68ad290b 100644
--- a/tests/test-num.ttl
+++ b/tests/good/test-num.ttl
diff --git a/tests/test-out-of-range-unicode.nt b/tests/good/test-out-of-range-unicode.nt
index 5def9e31..5def9e31 100644
--- a/tests/test-out-of-range-unicode.nt
+++ b/tests/good/test-out-of-range-unicode.nt
diff --git a/tests/test-out-of-range-unicode.ttl b/tests/good/test-out-of-range-unicode.ttl
index 7e64785a..7e64785a 100644
--- a/tests/test-out-of-range-unicode.ttl
+++ b/tests/good/test-out-of-range-unicode.ttl
diff --git a/tests/test-prefix.nt b/tests/good/test-prefix.nt
index bcfdd4b6..bcfdd4b6 100644
--- a/tests/test-prefix.nt
+++ b/tests/good/test-prefix.nt
diff --git a/tests/test-prefix.ttl b/tests/good/test-prefix.ttl
index f79896cb..f79896cb 100644
--- a/tests/test-prefix.ttl
+++ b/tests/good/test-prefix.ttl
diff --git a/tests/test-pretty.nt b/tests/good/test-pretty.nt
index f96a10e2..f96a10e2 100644
--- a/tests/test-pretty.nt
+++ b/tests/good/test-pretty.nt
diff --git a/tests/test-pretty.ttl b/tests/good/test-pretty.ttl
index 4eb7204f..4eb7204f 100644
--- a/tests/test-pretty.ttl
+++ b/tests/good/test-pretty.ttl
diff --git a/tests/test-rel.nt b/tests/good/test-rel.nt
index 01c18c2f..01c18c2f 100644
--- a/tests/test-rel.nt
+++ b/tests/good/test-rel.nt
diff --git a/tests/test-rel.ttl b/tests/good/test-rel.ttl
index a5927cd3..a5927cd3 100644
--- a/tests/test-rel.ttl
+++ b/tests/good/test-rel.ttl
diff --git a/tests/test-semi-dot.nt b/tests/good/test-semi-dot.nt
index aea1655b..aea1655b 100644
--- a/tests/test-semi-dot.nt
+++ b/tests/good/test-semi-dot.nt
diff --git a/tests/test-semi-dot.ttl b/tests/good/test-semi-dot.ttl
index 6d4b4146..6d4b4146 100644
--- a/tests/test-semi-dot.ttl
+++ b/tests/good/test-semi-dot.ttl
diff --git a/tests/test-uri.nt b/tests/good/test-uri.nt
index 6c56f594..6c56f594 100644
--- a/tests/test-uri.nt
+++ b/tests/good/test-uri.nt
diff --git a/tests/test-uri.ttl b/tests/good/test-uri.ttl
index cf43a38b..cf43a38b 100644
--- a/tests/test-uri.ttl
+++ b/tests/good/test-uri.ttl
diff --git a/tests/test-utf8-uri.nt b/tests/good/test-utf8-uri.nt
index b8a73a88..b8a73a88 100644
--- a/tests/test-utf8-uri.nt
+++ b/tests/good/test-utf8-uri.nt
diff --git a/tests/test-utf8-uri.ttl b/tests/good/test-utf8-uri.ttl
index 51f26ff2..51f26ff2 100644
--- a/tests/test-utf8-uri.ttl
+++ b/tests/good/test-utf8-uri.ttl
diff --git a/wscript b/wscript
index a0b5f532..54505cab 100644
--- a/wscript
+++ b/wscript
@@ -266,10 +266,11 @@ def file_equals(patha, pathb, subst_from='', subst_to=''):
 
 def test(ctx):
     blddir = autowaf.build_dir(APPNAME, 'tests')
-    try:
-        os.makedirs(os.path.join(blddir, 'bad'))
-    except:
-        pass
+    for i in ['', 'bad', 'good']:
+        try:
+            os.makedirs(os.path.join(blddir, i))
+        except:
+            pass
 
     for i in glob.glob(blddir + '/*.*'):
         os.remove(i)
@@ -277,15 +278,16 @@ def test(ctx):
     srcdir   = ctx.path.abspath()
     orig_dir = os.path.abspath(os.curdir)
 
-    os.chdir(srcdir)
-
-    good_tests = glob.glob('tests/*.ttl')
-    good_tests.sort()
-    good_tests.remove('tests/manifest.ttl')
+    os.chdir(os.path.join(srcdir, 'tests', 'good'))
+    old_good_tests = glob.glob('*.ttl')
+    old_good_tests.sort()
+    old_good_tests.remove('manifest.ttl')
+    good_tests = { 'good': old_good_tests }
+    os.chdir(orig_dir)
 
+    os.chdir(srcdir)
     bad_tests = glob.glob('tests/bad/*.ttl')
     bad_tests.sort()
-
     os.chdir(orig_dir)
 
     autowaf.pre_test(ctx, APPNAME)
@@ -295,16 +297,16 @@ def test(ctx):
     autowaf.run_tests(ctx, APPNAME, ['serd_test'], dirs=['.'])
 
     autowaf.run_tests(ctx, APPNAME, [
-            'serdi_static -o turtle %s/tests/base.ttl "base.ttl" > tests/base.ttl.out' % srcdir],
+            'serdi_static -o turtle %s/tests/good/base.ttl "base.ttl" > tests/good/base.ttl.out' % srcdir],
                       0, name='base')
 
-    if not file_equals('%s/tests/base.ttl' % srcdir, 'tests/base.ttl.out'):
+    if not file_equals('%s/tests/good/base.ttl' % srcdir, 'tests/good/base.ttl.out'):
         Logs.pprint('RED', 'FAIL: build/tests/base.ttl.out is incorrect')
 
     nul = os.devnull
     autowaf.run_tests(ctx, APPNAME, [
-            'serdi_static file://%s/tests/manifest.ttl > %s' % (srcdir, nul),
-            'serdi_static %s/tests/UTF-8.ttl > %s' % (srcdir, nul),
+            'serdi_static file://%s/tests/good/manifest.ttl > %s' % (srcdir, nul),
+            'serdi_static %s/tests/good/UTF-8.ttl > %s' % (srcdir, nul),
             'serdi_static -v > %s' % nul,
             'serdi_static -h > %s' % nul,
             'serdi_static -s "<foo> a <#Thingie> ." > %s' % nul,
@@ -327,66 +329,79 @@ def test(ctx):
             'serdi_static /no/such/file > %s' % nul],
                       1, name='serdi-cmd-bad')
 
-    commands = []
-    for test in good_tests:
-        base_uri = 'http://www.w3.org/2001/sw/DataAccess/df1/' + test.replace('\\', '/')
-        commands += [ 'serdi_static -f "%s" "%s" > %s.out' % (
-                os.path.join(srcdir, test), base_uri, test) ]
-
-    autowaf.run_tests(ctx, APPNAME, commands, 0, name='good')
-
-    Logs.pprint('BOLD', '\nVerifying turtle => ntriples')
-    for test in good_tests:
-        out_filename = test + '.out'
-        if not os.access(out_filename, os.F_OK):
-            Logs.pprint('RED', 'FAIL: %s output is missing' % test)
-        elif not file_equals(srcdir + '/' + test.replace('.ttl', '.nt'),
-                             test + '.out'):
-            Logs.pprint('RED', 'FAIL: %s is incorrect' % out_filename)
-        else:
-            Logs.pprint('GREEN', 'Pass: %s' % test)
-
+    def test_base(test):
+        return ('http://www.w3.org/2001/sw/DataAccess/df1/tests/'
+                + test.replace('\\', '/'))
+
+    # Good tests
+    for tdir, tests in good_tests.items():
+        commands = []
+     
+        for test in tests:
+            path = os.path.join('tests', tdir, test)
+            commands += [ 'serdi_static -f "%s" "%s" > %s.out' % (
+                    os.path.join(srcdir, path), test_base(test), path) ]
+    
+        autowaf.run_tests(ctx, APPNAME, commands, 0, name=tdir)
+    
+        Logs.pprint('BOLD', '\nVerifying turtle => ntriples')
+        for test in tests:
+            check_filename = os.path.join(
+                srcdir, 'tests', tdir, test.replace('.ttl', '.nt'))
+            out_filename = os.path.join('tests', tdir, test + '.out')
+            if not os.access(out_filename, os.F_OK):
+                Logs.pprint('RED', 'FAIL: %s output is missing' % test)
+            elif not file_equals(check_filename, out_filename):
+                Logs.pprint('RED', 'FAIL: %s is incorrect' % out_filename)
+            else:
+                Logs.pprint('GREEN', 'Pass: %s' % test)
+    
+    # Bad tests
     commands = []
     for test in bad_tests:
-        commands += [ 'serdi_static "%s" "http://www.w3.org/2001/sw/DataAccess/df1/%s" > %s.out' % (os.path.join(srcdir, test), test.replace('\\', '/'), test) ]
+        commands += [ 'serdi_static "%s" "%s" > %s.out' % (
+                os.path.join(srcdir, test), test_base(test), test) ]
 
     autowaf.run_tests(ctx, APPNAME, commands, 1, name='bad')
 
-    thru_tests = good_tests
-    thru_tests.remove(os.path.join('tests', 'test-id.ttl')) # IDs are mapped so files won't be identical
-
-    commands = []
-    num = 0
-    for test in thru_tests:
-        num += 1
-        flags = ''
-        if (num % 2 == 0):
-            flags += '-b'
-        if (num % 5 == 0):
-            flags += ' -f'
-        if (num % 3 == 0):
-            flags += ' -r http://www.w3.org/'
-        if (num % 7 == 0):
-            flags += ' -e'
-        base_uri = 'http://www.w3.org/2001/sw/DataAccess/df1/' + test.replace('\\', '/')
-        out_filename = test + '.thru'
-        commands += [
-            '%s %s -i ntriples -o turtle -p foo "%s" "%s" | %s -i turtle -o ntriples -c foo - "%s" > %s.thru' % (
-                'serdi_static', flags.ljust(5),
-                os.path.join(srcdir, test), base_uri,
-                'serdi_static', base_uri, test) ]
-
-    autowaf.run_tests(ctx, APPNAME, commands, 0, name='turtle-round-trip')
-    Logs.pprint('BOLD', '\nVerifying ntriples => turtle => ntriples')
-    for test in thru_tests:
-        out_filename = test + '.thru'
-        if not os.access(out_filename, os.F_OK):
-            Logs.pprint('RED', 'FAIL: %s output is missing' % test)
-        elif not file_equals(srcdir + '/' + test.replace('.ttl', '.nt'),
-                             test + '.thru',
-                             '_:docid', '_:genid'):
-            Logs.pprint('RED', 'FAIL: %s is incorrect' % out_filename)
-        else:
-            Logs.pprint('GREEN', 'Pass: %s' % test)
-
+    # Round-trip good tests
+    for tdir, tests in good_tests.items():
+        thru_tests = tests;
+        thru_tests.remove('test-id.ttl') # IDs are mapped so files won't match
+    
+        commands = []
+        num = 0
+        for test in thru_tests:
+            num += 1
+            flags = ''
+            if (num % 2 == 0):
+                flags += '-b'
+            if (num % 5 == 0):
+                flags += ' -f'
+            if (num % 3 == 0):
+                flags += ' -r http://www.w3.org/'
+            if (num % 7 == 0):
+                flags += ' -e'
+            out_filename = os.path.join('tests', tdir, test + '.thru')
+            commands += [
+                ('%s %s -i ntriples -o turtle -p foo "%s" "%s"'
+                '| %s -i turtle -o ntriples -c foo - "%s" > %s') % (
+                    'serdi_static', flags.ljust(5),
+                    os.path.join(srcdir, 'tests', tdir, test), test_base(test),
+                    'serdi_static', test_base(test), out_filename) ]
+    
+        autowaf.run_tests(ctx, APPNAME, commands, 0, name='turtle-round-trip')
+        Logs.pprint('BOLD', '\nVerifying ntriples => turtle => ntriples')
+        for test in thru_tests:
+            path         = os.path.join('tests', tdir, test)
+            out_filename = path + '.thru'
+            if not os.access(out_filename, os.F_OK):
+                Logs.pprint('RED', 'FAIL: %s output is missing' % test)
+            elif not file_equals(os.path.join(srcdir, path).replace('.ttl', '.nt'),
+                                 path + '.thru',
+                                 '_:docid', '_:genid'):
+                Logs.pprint('RED', 'FAIL: %s is incorrect' % out_filename)
+            else:
+                Logs.pprint('GREEN', 'Pass: %s' % test)
+    
     autowaf.post_test(ctx, APPNAME)