You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2026/05/31 20:55:15 UTC

(jena) 04/06: Remove old local copies of tests

This is an automated email from the ASF dual-hosted git repository.

afs pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git

commit 9a80b53cf7fb783fce608e632001d03ce83819a7
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Fri May 29 14:03:09 2026 +0100

    Remove old local copies of tests
---
 jena-arq/testing/ARQ/Algebra/data-1.ttl            |   3 -
 jena-arq/testing/ARQ/Algebra/data-2.ttl            |  10 -
 jena-arq/testing/ARQ/Algebra/filter-nested-1.rq    |   4 -
 jena-arq/testing/ARQ/Algebra/filter-nested-1.srx   |  16 -
 jena-arq/testing/ARQ/Algebra/filter-nested-2.rq    |   4 -
 jena-arq/testing/ARQ/Algebra/filter-nested-2.srx   |  11 -
 jena-arq/testing/ARQ/Algebra/filter-placement-1.rq |   7 -
 .../testing/ARQ/Algebra/filter-placement-1.srx     |  16 -
 jena-arq/testing/ARQ/Algebra/filter-placement-2.rq |   7 -
 .../testing/ARQ/Algebra/filter-placement-2.srx     |  16 -
 jena-arq/testing/ARQ/Algebra/filter-placement-3.rq |   9 -
 .../testing/ARQ/Algebra/filter-placement-3.srx     |  20 -
 jena-arq/testing/ARQ/Algebra/filter-scope-1.rq     |   9 -
 jena-arq/testing/ARQ/Algebra/filter-scope-1.srx    | 109 ---
 jena-arq/testing/ARQ/Algebra/manifest.ttl          | 141 ----
 jena-arq/testing/ARQ/Algebra/opt-filter-1.rq       |  11 -
 jena-arq/testing/ARQ/Algebra/opt-filter-1.srx      |  50 --
 jena-arq/testing/ARQ/Algebra/opt-filter-1.ttl      |   8 -
 jena-arq/testing/ARQ/Algebra/opt-filter-2.rq       |  12 -
 jena-arq/testing/ARQ/Algebra/opt-filter-2.srx      |  36 -
 jena-arq/testing/ARQ/Algebra/opt-filter-2.ttl      |   8 -
 jena-arq/testing/ARQ/Algebra/opt-filter-3.rq       |  10 -
 jena-arq/testing/ARQ/Algebra/opt-filter-3.srx      |  13 -
 jena-arq/testing/ARQ/Algebra/opt-filter-3.ttl      |   8 -
 jena-arq/testing/ARQ/Algebra/opt-filter-4.rq       |  13 -
 jena-arq/testing/ARQ/Algebra/opt-filter-4.srx      |  27 -
 jena-arq/testing/ARQ/Algebra/opt-filter-4.ttl      |  12 -
 jena-arq/testing/ARQ/Algebra/two-nested-opt-alt.rq |  10 -
 .../testing/ARQ/Algebra/two-nested-opt-alt.srx     |  28 -
 jena-arq/testing/ARQ/Algebra/two-nested-opt.rq     |  11 -
 jena-arq/testing/ARQ/Algebra/two-nested-opt.srx    |  17 -
 jena-arq/testing/ARQ/Algebra/two-nested-opt.ttl    |   6 -
 jena-arq/testing/ARQ/Algebra/var-scope-join-1.rq   |   8 -
 jena-arq/testing/ARQ/Algebra/var-scope-join-1.srx  |  13 -
 jena-arq/testing/ARQ/Algebra/var-scope-join-1.ttl  |  15 -
 jena-arq/testing/ARQ/Ask/ask-1.rq                  |   3 -
 jena-arq/testing/ARQ/Ask/ask-1.srx                 |   6 -
 jena-arq/testing/ARQ/Ask/ask-2.rq                  |   3 -
 jena-arq/testing/ARQ/Ask/ask-2.srj                 |   1 -
 jena-arq/testing/ARQ/Ask/ask-3.rq                  |   3 -
 jena-arq/testing/ARQ/Ask/ask-3.ttl                 |   7 -
 jena-arq/testing/ARQ/Ask/ask-4.rq                  |   3 -
 jena-arq/testing/ARQ/Ask/ask-4.srx                 |   6 -
 jena-arq/testing/ARQ/Ask/ask-5.rq                  |   3 -
 jena-arq/testing/ARQ/Ask/ask-5.srj                 |   1 -
 jena-arq/testing/ARQ/Ask/ask-6.rq                  |   3 -
 jena-arq/testing/ARQ/Ask/ask-6.ttl                 |   6 -
 jena-arq/testing/ARQ/Ask/ask-7.rq                  |   3 -
 jena-arq/testing/ARQ/Ask/ask-7.srx                 |   6 -
 jena-arq/testing/ARQ/Ask/ask-8.rq                  |   3 -
 jena-arq/testing/ARQ/Ask/ask-8.srx                 |   6 -
 jena-arq/testing/ARQ/Ask/data.ttl                  |   3 -
 jena-arq/testing/ARQ/Ask/manifest.ttl              |  73 --
 jena-arq/testing/ARQ/Assign/assign-01.arq          |   8 -
 jena-arq/testing/ARQ/Assign/assign-01.srx          |  59 --
 jena-arq/testing/ARQ/Assign/assign-02.arq          |   8 -
 jena-arq/testing/ARQ/Assign/assign-02.srx          |  21 -
 jena-arq/testing/ARQ/Assign/assign-03.arq          |   8 -
 jena-arq/testing/ARQ/Assign/assign-03.srx          |  43 --
 jena-arq/testing/ARQ/Assign/assign-04.arq          |   7 -
 jena-arq/testing/ARQ/Assign/assign-04.ttl          |  11 -
 jena-arq/testing/ARQ/Assign/assign-05.arq          |   8 -
 jena-arq/testing/ARQ/Assign/assign-05.srx          |  97 ---
 jena-arq/testing/ARQ/Assign/assign-06.arq          |   9 -
 jena-arq/testing/ARQ/Assign/assign-06.srx          |  39 --
 jena-arq/testing/ARQ/Assign/assign-07.arq          |   9 -
 jena-arq/testing/ARQ/Assign/assign-07.srx          |  11 -
 jena-arq/testing/ARQ/Assign/assign-08.arq          |  10 -
 jena-arq/testing/ARQ/Assign/assign-08.srx          |  21 -
 jena-arq/testing/ARQ/Assign/assign-09.arq          |   9 -
 jena-arq/testing/ARQ/Assign/assign-09.srx          |  21 -
 jena-arq/testing/ARQ/Assign/data.ttl               |  30 -
 jena-arq/testing/ARQ/Assign/manifest.ttl           |  89 ---
 jena-arq/testing/ARQ/Basic/data-1.ttl              |   8 -
 jena-arq/testing/ARQ/Basic/manifest.ttl            |  60 --
 jena-arq/testing/ARQ/Basic/q-base-prefix-1.rq      |   4 -
 jena-arq/testing/ARQ/Basic/q-base-prefix-2.rq      |   4 -
 jena-arq/testing/ARQ/Basic/q-base-prefix-3.rq      |   4 -
 jena-arq/testing/ARQ/Basic/q-base-prefix-4.rq      |   3 -
 jena-arq/testing/ARQ/Basic/q-base-prefix-5.rq      |   3 -
 jena-arq/testing/ARQ/Basic/r-base-prefix-1.ttl     |  21 -
 jena-arq/testing/ARQ/Basic/r-base-prefix-2.ttl     |  14 -
 jena-arq/testing/ARQ/Basic/r-base-prefix-3.ttl     |  12 -
 jena-arq/testing/ARQ/Basic/r-base-prefix-4.ttl     |   9 -
 jena-arq/testing/ARQ/Basic/r-base-prefix-5.ttl     |   9 -
 jena-arq/testing/ARQ/BasicPatterns/manifest.ttl    | 435 ------------
 jena-arq/testing/ARQ/BasicPatterns/model0.nt       |   2 -
 jena-arq/testing/ARQ/BasicPatterns/model1.nt       |   5 -
 jena-arq/testing/ARQ/BasicPatterns/model2.nt       |  20 -
 jena-arq/testing/ARQ/BasicPatterns/model3.nt       |   6 -
 jena-arq/testing/ARQ/BasicPatterns/model4.nt       |  12 -
 jena-arq/testing/ARQ/BasicPatterns/model5.nt       |  12 -
 jena-arq/testing/ARQ/BasicPatterns/model5.rdf      |  29 -
 jena-arq/testing/ARQ/BasicPatterns/model6.nt       |   3 -
 jena-arq/testing/ARQ/BasicPatterns/model7.nt       |   2 -
 jena-arq/testing/ARQ/BasicPatterns/model8.n3       |   6 -
 jena-arq/testing/ARQ/BasicPatterns/model9.n3       |  17 -
 jena-arq/testing/ARQ/BasicPatterns/modelA.nt       |   2 -
 jena-arq/testing/ARQ/BasicPatterns/query-dump.rq   |   3 -
 jena-arq/testing/ARQ/BasicPatterns/result-0-01.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-0-02.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-0-03.n3  |  12 -
 jena-arq/testing/ARQ/BasicPatterns/result-0-04.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-01.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-02.n3  |  22 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-03.n3  |  22 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-04.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-05.n3  |  12 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-06.n3  |  12 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-07.n3  |   6 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-08.n3  |   7 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-09.n3  |  12 -
 jena-arq/testing/ARQ/BasicPatterns/result-1-10.n3  |  11 -
 jena-arq/testing/ARQ/BasicPatterns/result-2-01.n3  |  45 --
 jena-arq/testing/ARQ/BasicPatterns/result-2-02.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-2-03.n3  | 115 ----
 jena-arq/testing/ARQ/BasicPatterns/result-2-04.n3  |  54 --
 jena-arq/testing/ARQ/BasicPatterns/result-2-05.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-2-06.n3  |   8 -
 jena-arq/testing/ARQ/BasicPatterns/result-2-07.n3  |  54 --
 jena-arq/testing/ARQ/BasicPatterns/result-2-08.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-2-09.n3  |  54 --
 jena-arq/testing/ARQ/BasicPatterns/result-2-10.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-3-01.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-3-02.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-3-03.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-3-04.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-3-05.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-3-06.n3  |   9 -
 jena-arq/testing/ARQ/BasicPatterns/result-3-07.n3  |  36 -
 jena-arq/testing/ARQ/BasicPatterns/result-4-01.n3  |  89 ---
 jena-arq/testing/ARQ/BasicPatterns/result-4-02.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-4-03.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-4-04.n3  |   8 -
 jena-arq/testing/ARQ/BasicPatterns/result-4-05.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-4-06.n3  |  87 ---
 jena-arq/testing/ARQ/BasicPatterns/result-4-07.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-5-01.n3  |  22 -
 jena-arq/testing/ARQ/BasicPatterns/result-5-02.n3  |  12 -
 jena-arq/testing/ARQ/BasicPatterns/result-5-03.n3  |  22 -
 jena-arq/testing/ARQ/BasicPatterns/result-5-04.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-6-01.n3  |  22 -
 jena-arq/testing/ARQ/BasicPatterns/result-6-02.n3  |  12 -
 jena-arq/testing/ARQ/BasicPatterns/result-6-03.n3  |  22 -
 jena-arq/testing/ARQ/BasicPatterns/result-6-04.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-7-01.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-7-02.n3  |  37 -
 jena-arq/testing/ARQ/BasicPatterns/result-7-03.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-7-04.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-8-01.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-8-02.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-8-03.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-8-04.n3  |  27 -
 jena-arq/testing/ARQ/BasicPatterns/result-8-05.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-9-01.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-9-02.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-A-01.n3  |  36 -
 jena-arq/testing/ARQ/BasicPatterns/result-A-02.n3  |  36 -
 .../ARQ/BasicPatterns/result-B-01-RDF_10.n3        |  19 -
 .../ARQ/BasicPatterns/result-B-01-RDF_11.n3        |  24 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-01.n3  |  24 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-02.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-03.n3  |   8 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-04.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-05.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-06.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-07.n3  | 106 ---
 jena-arq/testing/ARQ/BasicPatterns/result-B-08.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-09.n3  |  21 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-10.n3  |  22 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-11.n3  |  62 --
 jena-arq/testing/ARQ/BasicPatterns/result-B-12.n3  |  18 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-13.n3  |  14 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-15.n3  |  19 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-16.n3  |  19 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-17.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-18.n3  |  20 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-19.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-B-20.n3  |  20 -
 jena-arq/testing/ARQ/BasicPatterns/result-S-01.n3  |  11 -
 jena-arq/testing/ARQ/BasicPatterns/result-S-02.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-S-03.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-S-04.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/result-S-05.n3  |  15 -
 jena-arq/testing/ARQ/BasicPatterns/test-0-01.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-0-02.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-0-03.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-0-04.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-01.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-02.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-03.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-04.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-05.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-06.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-07.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-08.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-09.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-1-10.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-01.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-02.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-03.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-04.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-05.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-06.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-07.rq    |   6 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-08.rq    |   6 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-09.rq    |   6 -
 jena-arq/testing/ARQ/BasicPatterns/test-2-10.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-3-01.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-3-02.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-3-03.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-3-04.rq    |   6 -
 jena-arq/testing/ARQ/BasicPatterns/test-3-05.rq    |   7 -
 jena-arq/testing/ARQ/BasicPatterns/test-3-06.rq    |   7 -
 jena-arq/testing/ARQ/BasicPatterns/test-3-07.rq    |   7 -
 jena-arq/testing/ARQ/BasicPatterns/test-4-01.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-4-02.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-4-03.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-4-04.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-4-05.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-4-06.rq    |   6 -
 jena-arq/testing/ARQ/BasicPatterns/test-4-07.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-5-01.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-5-02.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-5-03.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-5-04.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-6-01.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-6-02.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-6-03.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-6-04.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-7-01.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-7-02.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-7-03.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-7-04.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-8-01.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-8-02.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-8-03.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-8-04.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-8-05.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-9-01.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-9-02.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-A-01.rq    |   8 -
 jena-arq/testing/ARQ/BasicPatterns/test-A-02.rq    |   7 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-01.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-02.rq    |   4 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-03.rq    |   4 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-04.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-05.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-06.rq    |   6 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-07.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-08.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-09.rq    |   4 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-10.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-11.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-12.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-13.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-15.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-16.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-17.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-18.rq    |   7 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-19.rq    |   3 -
 jena-arq/testing/ARQ/BasicPatterns/test-B-20.rq    |   5 -
 jena-arq/testing/ARQ/BasicPatterns/test-S-01.rq    |   4 -
 jena-arq/testing/ARQ/BasicPatterns/test-S-02.rq    |   4 -
 jena-arq/testing/ARQ/BasicPatterns/test-S-03.rq    |   4 -
 jena-arq/testing/ARQ/BasicPatterns/test-S-04.rq    |   4 -
 jena-arq/testing/ARQ/BasicPatterns/test-S-05.rq    |   4 -
 jena-arq/testing/ARQ/Bound/bound1-result.n3        |  20 -
 jena-arq/testing/ARQ/Bound/bound1.rq               |   8 -
 jena-arq/testing/ARQ/Bound/data.n3                 |   5 -
 jena-arq/testing/ARQ/Bound/manifest.ttl            |  34 -
 jena-arq/testing/ARQ/Construct/data-1.ttl          |   6 -
 jena-arq/testing/ARQ/Construct/dft.ttl             |   2 -
 jena-arq/testing/ARQ/Construct/g1.ttl              |   3 -
 jena-arq/testing/ARQ/Construct/g2.ttl              |   2 -
 jena-arq/testing/ARQ/Construct/manifest.ttl        | 172 -----
 jena-arq/testing/ARQ/Construct/q-construct-1.rq    |   7 -
 jena-arq/testing/ARQ/Construct/q-construct-2.rq    |   8 -
 .../ARQ/Construct/q-construct-quad-dataset.arq     |   6 -
 .../Construct/q-construct-quad-default-graph-1.arq |   6 -
 .../Construct/q-construct-quad-default-graph-2.arq |   6 -
 .../ARQ/Construct/q-construct-quad-named-graph.arq |   6 -
 .../Construct/q-construct-quad-short-form-1.arq    |   5 -
 .../Construct/q-construct-quad-short-form-2.arq    |   5 -
 .../Construct/q-construct-quad-short-form-3.arq    |   5 -
 .../ARQ/Construct/q-construct-quad-syntax-1.arq    |   3 -
 .../ARQ/Construct/q-construct-quad-syntax-2.arq    |   3 -
 .../ARQ/Construct/q-construct-quad-syntax-3.arq    |   4 -
 .../ARQ/Construct/q-construct-quad-syntax-4.arq    |   9 -
 .../ARQ/Construct/q-construct-quad-syntax-5.arq    |   9 -
 .../ARQ/Construct/q-construct-quad-syntax-6.arq    |  14 -
 .../ARQ/Construct/q-construct-quad-syntax-7.arq    |   7 -
 .../ARQ/Construct/q-construct-quad-syntax-8.arq    |   9 -
 jena-arq/testing/ARQ/Construct/q-reif-1.rq         |   8 -
 jena-arq/testing/ARQ/Construct/q-reif-2.rq         |   9 -
 jena-arq/testing/ARQ/Construct/reif-1.arq          |   5 -
 jena-arq/testing/ARQ/Construct/reif-2.arq          |   7 -
 jena-arq/testing/ARQ/Construct/reif-data-1.ttl     |   9 -
 jena-arq/testing/ARQ/Construct/reif-data-2.ttl     |  19 -
 jena-arq/testing/ARQ/Construct/reif-result-1.rdf   |  22 -
 jena-arq/testing/ARQ/Construct/reif-result-2.rdf   |  11 -
 .../testing/ARQ/Construct/results-construct-1.ttl  |   8 -
 .../testing/ARQ/Construct/results-construct-2.ttl  |   3 -
 .../Construct/results-construct-quad-data-2.ttl    |   2 -
 .../Construct/results-construct-quad-dataset.trig  |   4 -
 .../results-construct-quad-default-graph.ttl       |   3 -
 .../results-construct-quad-named-graph.trig        |   3 -
 .../results-construct-quad-short-form-1.trig       |   3 -
 .../results-construct-quad-short-form-2.ttl        |   2 -
 .../results-construct-quad-short-form-3.trig       |   4 -
 .../Construct/results-construct-quad-syntax-1.trig |   2 -
 .../Construct/results-construct-quad-syntax-2.trig |   0
 .../Construct/results-construct-quad-syntax-3.ttl  |   2 -
 .../Construct/results-construct-quad-syntax-4.trig |   6 -
 .../Construct/results-construct-quad-syntax-5.trig |   6 -
 .../Construct/results-construct-quad-syntax-6.trig |   6 -
 .../Construct/results-construct-quad-syntax-7.ttl  |   2 -
 .../Construct/results-construct-quad-syntax-8.trig |   0
 jena-arq/testing/ARQ/Dataset/a.ttl                 |   2 -
 jena-arq/testing/ARQ/Dataset/b.ttl                 |   2 -
 jena-arq/testing/ARQ/Dataset/c.ttl                 |   3 -
 jena-arq/testing/ARQ/Dataset/d.ttl                 |   4 -
 jena-arq/testing/ARQ/Dataset/dft.ttl               |   2 -
 jena-arq/testing/ARQ/Dataset/empty.nt              |   0
 jena-arq/testing/ARQ/Dataset/graph-01-result.ttl   |   6 -
 jena-arq/testing/ARQ/Dataset/graph-01.rq           |   8 -
 jena-arq/testing/ARQ/Dataset/graph-02-result.ttl   |  28 -
 jena-arq/testing/ARQ/Dataset/graph-02.rq           |  10 -
 jena-arq/testing/ARQ/Dataset/graph-03-result.ttl   |  25 -
 jena-arq/testing/ARQ/Dataset/graph-03.rq           |   6 -
 jena-arq/testing/ARQ/Dataset/graph-04-result.ttl   |  54 --
 jena-arq/testing/ARQ/Dataset/graph-04.rq           |  11 -
 jena-arq/testing/ARQ/Dataset/graph-05-result.ttl   |  54 --
 jena-arq/testing/ARQ/Dataset/graph-05.rq           |  10 -
 jena-arq/testing/ARQ/Dataset/graph-06-result.ttl   |  27 -
 jena-arq/testing/ARQ/Dataset/graph-06.rq           |   6 -
 jena-arq/testing/ARQ/Dataset/graph-07-result.ttl   |  13 -
 jena-arq/testing/ARQ/Dataset/graph-07.rq           |  10 -
 jena-arq/testing/ARQ/Dataset/graph-08-result.ttl   |  13 -
 jena-arq/testing/ARQ/Dataset/graph-08.rq           |   6 -
 jena-arq/testing/ARQ/Dataset/graph-09-result.srx   |  13 -
 jena-arq/testing/ARQ/Dataset/graph-09.rq           |   4 -
 jena-arq/testing/ARQ/Dataset/graph-10-result.srx   |  11 -
 jena-arq/testing/ARQ/Dataset/graph-10.rq           |   4 -
 jena-arq/testing/ARQ/Dataset/graph-11-result.ttl   |   9 -
 jena-arq/testing/ARQ/Dataset/graph-11.rq           |   8 -
 jena-arq/testing/ARQ/Dataset/graph-20-result.ttl   |  10 -
 jena-arq/testing/ARQ/Dataset/graph-20.rq           |   9 -
 jena-arq/testing/ARQ/Dataset/graph-21-result.ttl   |  23 -
 jena-arq/testing/ARQ/Dataset/graph-21.rq           |  10 -
 jena-arq/testing/ARQ/Dataset/manifest.ttl          | 122 ----
 jena-arq/testing/ARQ/Describe/books.n3             |  37 -
 jena-arq/testing/ARQ/Describe/data-0.ttl           |   3 -
 jena-arq/testing/ARQ/Describe/data-1.ttl           |   9 -
 jena-arq/testing/ARQ/Describe/data-2.ttl           |   4 -
 .../testing/ARQ/Describe/describe-01-results.rdf   |   7 -
 jena-arq/testing/ARQ/Describe/describe-01.rq       |   3 -
 .../testing/ARQ/Describe/describe-02-results.rdf   |  17 -
 jena-arq/testing/ARQ/Describe/describe-02.rq       |   3 -
 .../testing/ARQ/Describe/describe-03-results.rdf   |  17 -
 jena-arq/testing/ARQ/Describe/describe-03.rq       |   7 -
 .../testing/ARQ/Describe/describe-04-results.rdf   |  33 -
 jena-arq/testing/ARQ/Describe/describe-04.rq       |   6 -
 .../testing/ARQ/Describe/describe-05-results.rdf   |  10 -
 jena-arq/testing/ARQ/Describe/describe-05.rq       |   7 -
 .../testing/ARQ/Describe/describe-06-results.ttl   |  10 -
 jena-arq/testing/ARQ/Describe/describe-06.rq       |   1 -
 jena-arq/testing/ARQ/Describe/manifest.ttl         |  67 --
 jena-arq/testing/ARQ/Distinct/data-multipath.ttl   |   9 -
 jena-arq/testing/ARQ/Distinct/data-node.ttl        |   9 -
 jena-arq/testing/ARQ/Distinct/data-num.ttl         |  35 -
 jena-arq/testing/ARQ/Distinct/data-opt.ttl         |  13 -
 jena-arq/testing/ARQ/Distinct/data-str.ttl         |  29 -
 .../testing/ARQ/Distinct/distinct-1-results.srx    |  61 --
 jena-arq/testing/ARQ/Distinct/distinct-1.rq        |   7 -
 jena-arq/testing/ARQ/Distinct/distinct-2.rq        |   8 -
 jena-arq/testing/ARQ/Distinct/distinct-all.srx     |  93 ---
 .../testing/ARQ/Distinct/distinct-all_RDF_10.srx   | 111 ---
 .../testing/ARQ/Distinct/distinct-all_RDF_11.srx   |  93 ---
 jena-arq/testing/ARQ/Distinct/distinct-multi-1.rq  |   3 -
 jena-arq/testing/ARQ/Distinct/distinct-multi-1.srj |  12 -
 jena-arq/testing/ARQ/Distinct/distinct-multi-2.arq |   3 -
 jena-arq/testing/ARQ/Distinct/distinct-multi-2.srj |  12 -
 jena-arq/testing/ARQ/Distinct/distinct-multi-3.rq  |   3 -
 jena-arq/testing/ARQ/Distinct/distinct-multi-3.srj |  12 -
 jena-arq/testing/ARQ/Distinct/distinct-node.srx    |  21 -
 jena-arq/testing/ARQ/Distinct/distinct-num.srx     |  56 --
 jena-arq/testing/ARQ/Distinct/distinct-opt.srx     |  23 -
 jena-arq/testing/ARQ/Distinct/distinct-str.srx     |  38 --
 .../testing/ARQ/Distinct/distinct-str_RDF_10.srx   |  56 --
 .../testing/ARQ/Distinct/distinct-str_RDF_11.srx   |  38 --
 jena-arq/testing/ARQ/Distinct/manifest.ttl         | 210 ------
 jena-arq/testing/ARQ/Distinct/no-distinct-1.rq     |   4 -
 jena-arq/testing/ARQ/Distinct/no-distinct-2.rq     |   8 -
 jena-arq/testing/ARQ/Distinct/no-distinct-all.srx  | 231 -------
 .../testing/ARQ/Distinct/no-distinct-multi-1.rq    |   3 -
 .../testing/ARQ/Distinct/no-distinct-multi-1.srj   |  18 -
 .../testing/ARQ/Distinct/no-distinct-multi-2.arq   |   3 -
 .../testing/ARQ/Distinct/no-distinct-multi-2.srj   |  18 -
 .../testing/ARQ/Distinct/no-distinct-multi-3.rq    |   3 -
 .../testing/ARQ/Distinct/no-distinct-multi-3.srj   |  18 -
 jena-arq/testing/ARQ/Distinct/no-distinct-node.srx |  31 -
 jena-arq/testing/ARQ/Distinct/no-distinct-num.srx  | 121 ----
 jena-arq/testing/ARQ/Distinct/no-distinct-opt.srx  |  35 -
 jena-arq/testing/ARQ/Distinct/no-distinct-str.srx  | 101 ---
 jena-arq/testing/ARQ/Distinct/reduced-multi-1.rq   |   3 -
 jena-arq/testing/ARQ/Distinct/reduced-multi-1.srj  |  12 -
 jena-arq/testing/ARQ/Distinct/reduced-multi-2.arq  |   3 -
 jena-arq/testing/ARQ/Distinct/reduced-multi-2.srj  |  12 -
 jena-arq/testing/ARQ/Distinct/reduced-multi-3.rq   |   3 -
 jena-arq/testing/ARQ/Distinct/reduced-multi-3.srj  |  12 -
 jena-arq/testing/ARQ/Examples/data-1.ttl           |   9 -
 jena-arq/testing/ARQ/Examples/data-2.ttl           |   9 -
 jena-arq/testing/ARQ/Examples/ex-label-1.rq        |   6 -
 jena-arq/testing/ARQ/Examples/ex-localname-1.rq    |   9 -
 jena-arq/testing/ARQ/Examples/ex-localname-2.rq    |  10 -
 jena-arq/testing/ARQ/Examples/ex-localname-3.rq    |   9 -
 jena-arq/testing/ARQ/Examples/ex-localname-4.rq    |   8 -
 jena-arq/testing/ARQ/Examples/ex-localname-5.rq    |   9 -
 jena-arq/testing/ARQ/Examples/ex-uppercase-1.rq    |   8 -
 jena-arq/testing/ARQ/Examples/ex-uppercase-2.rq    |   8 -
 jena-arq/testing/ARQ/Examples/manifest.ttl         |  76 ---
 jena-arq/testing/ARQ/Examples/result-example-1.srj |  17 -
 jena-arq/testing/ARQ/Examples/result-label-1.srj   |  17 -
 .../testing/ARQ/Examples/result-localname-1.srj    |  31 -
 .../testing/ARQ/Examples/result-localname-2.srj    |  31 -
 .../testing/ARQ/Examples/result-localname-3.srj    |  23 -
 .../testing/ARQ/Examples/result-localname-4.srj    |  20 -
 .../testing/ARQ/Examples/result-localname-5.srj    |  12 -
 .../testing/ARQ/Examples/result-uppercase-1.srj    |  15 -
 .../testing/ARQ/Examples/result-uppercase-2.srj    |  17 -
 jena-arq/testing/ARQ/Expr/data-1.ttl               |   3 -
 jena-arq/testing/ARQ/Expr/manifest.ttl             |  53 --
 jena-arq/testing/ARQ/Expr/q-expr-1.rq              |   2 -
 jena-arq/testing/ARQ/Expr/q-expr-2.rq              |   2 -
 jena-arq/testing/ARQ/Expr/q-expr-3.rq              |   7 -
 jena-arq/testing/ARQ/Expr/q-expr-4.rq              |   7 -
 jena-arq/testing/ARQ/Expr/result-expr-1.ttl        |   6 -
 jena-arq/testing/ARQ/Expr/result-expr-2.ttl        |   4 -
 jena-arq/testing/ARQ/Expr/result-expr-3.srx        |  12 -
 jena-arq/testing/ARQ/Expr/result-expr-4.srx        |  10 -
 jena-arq/testing/ARQ/Expr/result-expr-4.ttl        |   7 -
 jena-arq/testing/ARQ/Expr1/data-1.ttl              |  11 -
 jena-arq/testing/ARQ/Expr1/expr-1-result.ttl       |  26 -
 jena-arq/testing/ARQ/Expr1/expr-1.rq               |  10 -
 jena-arq/testing/ARQ/Expr1/expr-2-result.ttl       |  16 -
 jena-arq/testing/ARQ/Expr1/expr-2.rq               |   9 -
 jena-arq/testing/ARQ/Expr1/expr-3-result.ttl       |  21 -
 jena-arq/testing/ARQ/Expr1/expr-3.rq               |   9 -
 jena-arq/testing/ARQ/Expr1/manifest.ttl            |  44 --
 jena-arq/testing/ARQ/Expr2/data-1.ttl              |  14 -
 jena-arq/testing/ARQ/Expr2/data-2.ttl              |  19 -
 jena-arq/testing/ARQ/Expr2/manifest.ttl            |  62 --
 jena-arq/testing/ARQ/Expr2/query-bev-1.rq          |   7 -
 jena-arq/testing/ARQ/Expr2/query-bev-2.rq          |   7 -
 jena-arq/testing/ARQ/Expr2/query-bev-3.rq          |   7 -
 jena-arq/testing/ARQ/Expr2/query-bev-4.rq          |   7 -
 jena-arq/testing/ARQ/Expr2/query-bev-5.rq          |   9 -
 jena-arq/testing/ARQ/Expr2/query-bev-6.rq          |   9 -
 jena-arq/testing/ARQ/Expr2/result-bev-1.ttl        |  27 -
 jena-arq/testing/ARQ/Expr2/result-bev-2.ttl        |  27 -
 jena-arq/testing/ARQ/Expr2/result-bev-3.ttl        |  27 -
 jena-arq/testing/ARQ/Expr2/result-bev-4.ttl        |  27 -
 jena-arq/testing/ARQ/Expr2/result-bev-5.ttl        |  12 -
 jena-arq/testing/ARQ/Expr2/result-bev-6.ttl        |  16 -
 .../testing/ARQ/ExprBuiltIns/data-builtin-1.ttl    |  20 -
 .../testing/ARQ/ExprBuiltIns/data-builtin-2.ttl    |  14 -
 .../testing/ARQ/ExprBuiltIns/data-langMatches.ttl  |   7 -
 jena-arq/testing/ARQ/ExprBuiltIns/manifest.ttl     | 149 -----
 jena-arq/testing/ARQ/ExprBuiltIns/q-blank-1.rq     |   7 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-datatype-1.rq  |   7 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-datatype-2.rq  |   9 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-datatype-3.rq  |   9 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-datatype-4.rq  |  10 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-iri-1.rq       |   7 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-lang-1.rq      |   9 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-lang-2.rq      |   7 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-lang-3.rq      |   6 -
 .../testing/ARQ/ExprBuiltIns/q-langMatches-1.rq    |   4 -
 .../testing/ARQ/ExprBuiltIns/q-langMatches-2.rq    |   4 -
 .../testing/ARQ/ExprBuiltIns/q-langMatches-3.rq    |   4 -
 .../testing/ARQ/ExprBuiltIns/q-langMatches-4.rq    |   4 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-str-1.rq       |   7 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-str-2.rq       |   7 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-str-3.rq       |   7 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-str-4.rq       |   7 -
 jena-arq/testing/ARQ/ExprBuiltIns/q-uri-1.rq       |   7 -
 .../testing/ARQ/ExprBuiltIns/result-blank-1.ttl    |  16 -
 .../testing/ARQ/ExprBuiltIns/result-datatype-1.ttl |  32 -
 .../testing/ARQ/ExprBuiltIns/result-datatype-2.srx |  33 -
 .../testing/ARQ/ExprBuiltIns/result-datatype-3.srx |  21 -
 .../testing/ARQ/ExprBuiltIns/result-datatype-4.srx |  13 -
 jena-arq/testing/ARQ/ExprBuiltIns/result-iri-1.ttl |  16 -
 .../testing/ARQ/ExprBuiltIns/result-lang-1.srx     |  36 -
 .../testing/ARQ/ExprBuiltIns/result-lang-2.srx     |  31 -
 .../testing/ARQ/ExprBuiltIns/result-lang-3.srx     |  16 -
 .../ARQ/ExprBuiltIns/result-langMatches-1.ttl      |  14 -
 .../ARQ/ExprBuiltIns/result-langMatches-2.ttl      |  21 -
 .../ARQ/ExprBuiltIns/result-langMatches-3.ttl      |  28 -
 .../ARQ/ExprBuiltIns/result-langMatches-4.ttl      |  14 -
 jena-arq/testing/ARQ/ExprBuiltIns/result-str-1.ttl |  40 --
 jena-arq/testing/ARQ/ExprBuiltIns/result-str-2.ttl |  16 -
 jena-arq/testing/ARQ/ExprBuiltIns/result-str-3.ttl |  24 -
 jena-arq/testing/ARQ/ExprBuiltIns/result-str-4.ttl |  15 -
 jena-arq/testing/ARQ/ExprBuiltIns/result-uri-1.ttl |  16 -
 jena-arq/testing/ARQ/ExprDatatypes/datatype.ttl    |  14 -
 jena-arq/testing/ARQ/ExprDatatypes/dt-query-1.rq   |   5 -
 jena-arq/testing/ARQ/ExprDatatypes/dt-query-2.rq   |   5 -
 jena-arq/testing/ARQ/ExprDatatypes/dt-query-3.rq   |   5 -
 jena-arq/testing/ARQ/ExprDatatypes/dt-query-4.rq   |   6 -
 jena-arq/testing/ARQ/ExprDatatypes/dt-query-5.rq   |   5 -
 jena-arq/testing/ARQ/ExprDatatypes/dt-result-1.srx |  20 -
 jena-arq/testing/ARQ/ExprDatatypes/dt-result-2.srx |  20 -
 jena-arq/testing/ARQ/ExprDatatypes/dt-result-3.srx |  52 --
 jena-arq/testing/ARQ/ExprDatatypes/dt-result-4.srx |  52 --
 jena-arq/testing/ARQ/ExprDatatypes/dt-result-5.srx |  20 -
 jena-arq/testing/ARQ/ExprDatatypes/manifest.ttl    |  62 --
 jena-arq/testing/ARQ/ExprEquals/Notes.txt          |  28 -
 jena-arq/testing/ARQ/ExprEquals/data-eq.ttl        |  23 -
 jena-arq/testing/ARQ/ExprEquals/manifest.ttl       | 123 ----
 jena-arq/testing/ARQ/ExprEquals/query-eq-1.rq      |   7 -
 jena-arq/testing/ARQ/ExprEquals/query-eq-2.rq      |   7 -
 jena-arq/testing/ARQ/ExprEquals/query-eq-3.rq      |   7 -
 jena-arq/testing/ARQ/ExprEquals/query-eq-4.rq      |   7 -
 jena-arq/testing/ARQ/ExprEquals/query-eq-5.rq      |   7 -
 .../testing/ARQ/ExprEquals/query-eq-graph-1.rq     |   6 -
 .../testing/ARQ/ExprEquals/query-eq-graph-2.rq     |   6 -
 .../testing/ARQ/ExprEquals/query-eq-graph-3.rq     |   6 -
 .../testing/ARQ/ExprEquals/query-eq-graph-4.rq     |   6 -
 .../testing/ARQ/ExprEquals/query-eq-graph-5.rq     |   5 -
 jena-arq/testing/ARQ/ExprEquals/query-eq2-1.rq     |   8 -
 jena-arq/testing/ARQ/ExprEquals/query-eq2-2.rq     |   8 -
 .../testing/ARQ/ExprEquals/query-eq2-graph-1.rq    |   7 -
 jena-arq/testing/ARQ/ExprEquals/result-eq-1.ttl    |  37 -
 jena-arq/testing/ARQ/ExprEquals/result-eq-2.ttl    |  37 -
 jena-arq/testing/ARQ/ExprEquals/result-eq-3.ttl    |  12 -
 jena-arq/testing/ARQ/ExprEquals/result-eq-4.ttl    |  12 -
 jena-arq/testing/ARQ/ExprEquals/result-eq-5.ttl    |  12 -
 .../testing/ARQ/ExprEquals/result-eq-graph-1.ttl   |  19 -
 .../testing/ARQ/ExprEquals/result-eq-graph-2.ttl   |  19 -
 .../testing/ARQ/ExprEquals/result-eq-graph-3.ttl   |  11 -
 .../testing/ARQ/ExprEquals/result-eq-graph-4.ttl   |  11 -
 .../testing/ARQ/ExprEquals/result-eq-graph-5.ttl   |  11 -
 jena-arq/testing/ARQ/ExprEquals/result-eq2-1.ttl   | 288 --------
 jena-arq/testing/ARQ/ExprEquals/result-eq2-2.ttl   | 104 ---
 .../testing/ARQ/ExprEquals/result-eq2-graph-1.ttl  | 229 -------
 jena-arq/testing/ARQ/ExprRegex/data-regex-1.ttl    |  22 -
 jena-arq/testing/ARQ/ExprRegex/data-regex-2.ttl    |   7 -
 jena-arq/testing/ARQ/ExprRegex/manifest.ttl        |  60 --
 jena-arq/testing/ARQ/ExprRegex/q-regex-1.rq        |   7 -
 jena-arq/testing/ARQ/ExprRegex/q-regex-2.rq        |   7 -
 jena-arq/testing/ARQ/ExprRegex/q-regex-3.rq        |   8 -
 jena-arq/testing/ARQ/ExprRegex/q-regex-4.rq        |   9 -
 jena-arq/testing/ARQ/ExprRegex/q-regex-5.rq        |   8 -
 jena-arq/testing/ARQ/ExprRegex/result-regex-1.ttl  |  10 -
 jena-arq/testing/ARQ/ExprRegex/result-regex-2.ttl  |  14 -
 jena-arq/testing/ARQ/ExprRegex/result-regex-3.ttl  |  10 -
 jena-arq/testing/ARQ/ExprRegex/result-regex-4.ttl  |  14 -
 jena-arq/testing/ARQ/ExprRegex/result-regex-5.ttl  |  15 -
 jena-arq/testing/ARQ/Function/concat-1.arq         |   4 -
 jena-arq/testing/ARQ/Function/concat-1.srj         |  12 -
 jena-arq/testing/ARQ/Function/concat-2.arq         |   4 -
 jena-arq/testing/ARQ/Function/concat-2.srj         |  12 -
 jena-arq/testing/ARQ/Function/data-0.ttl           |   1 -
 jena-arq/testing/ARQ/Function/data-1.ttl           |  15 -
 jena-arq/testing/ARQ/Function/data-2.ttl           |  13 -
 jena-arq/testing/ARQ/Function/data-3.ttl           |  19 -
 jena-arq/testing/ARQ/Function/data-4.ttl           |  10 -
 jena-arq/testing/ARQ/Function/data-5.ttl           |  31 -
 jena-arq/testing/ARQ/Function/data-6.ttl           |   8 -
 jena-arq/testing/ARQ/Function/func-01-results.ttl  |  18 -
 jena-arq/testing/ARQ/Function/func-01.rq           |   8 -
 jena-arq/testing/ARQ/Function/func-02-results.ttl  |   7 -
 jena-arq/testing/ARQ/Function/func-02.rq           |   7 -
 jena-arq/testing/ARQ/Function/func-03-results.ttl  |  17 -
 jena-arq/testing/ARQ/Function/func-03.rq           |   8 -
 jena-arq/testing/ARQ/Function/func-04-results.ttl  |  17 -
 jena-arq/testing/ARQ/Function/func-04.rq           |   8 -
 jena-arq/testing/ARQ/Function/func-sha1sum-1.rq    |  12 -
 jena-arq/testing/ARQ/Function/func-sha1sum-2.rq    |  13 -
 jena-arq/testing/ARQ/Function/lang-1-results.srx   |  21 -
 jena-arq/testing/ARQ/Function/lang-2-results.srx   |  31 -
 jena-arq/testing/ARQ/Function/localname-1.rq       |   8 -
 jena-arq/testing/ARQ/Function/localname-1.srj      |  17 -
 jena-arq/testing/ARQ/Function/manifest.ttl         | 155 -----
 jena-arq/testing/ARQ/Function/namespace-1.rq       |   8 -
 jena-arq/testing/ARQ/Function/namespace-1.srj      |  35 -
 jena-arq/testing/ARQ/Function/q-lang-1.rq          |   7 -
 jena-arq/testing/ARQ/Function/q-lang-2.rq          |   6 -
 .../testing/ARQ/Function/sha1sum-1-results.srx     |  21 -
 .../testing/ARQ/Function/sha1sum-2-results.srx     |  21 -
 jena-arq/testing/ARQ/Function/strjoin-1.arq        |   4 -
 jena-arq/testing/ARQ/Function/strjoin-1.srj        |  12 -
 jena-arq/testing/ARQ/Function/strjoin-2.arq        |   7 -
 jena-arq/testing/ARQ/Function/strjoin-2.srj        |  13 -
 jena-arq/testing/ARQ/Function/strlen-1.rq          |   7 -
 jena-arq/testing/ARQ/Function/strlen-1.srj         |  19 -
 jena-arq/testing/ARQ/Function/strlen-2.rq          |   7 -
 jena-arq/testing/ARQ/Function/strlen-2.srj         |  15 -
 jena-arq/testing/ARQ/Function/substring-1.rq       |   7 -
 jena-arq/testing/ARQ/Function/substring-1.srx      |  20 -
 jena-arq/testing/ARQ/Function/substring-2.rq       |   7 -
 jena-arq/testing/ARQ/Function/substring-2.srx      |  20 -
 jena-arq/testing/ARQ/Function/substring-3.rq       |   7 -
 jena-arq/testing/ARQ/Function/substring-3.srx      |  12 -
 jena-arq/testing/ARQ/General/bad-lex-1.rq          |   7 -
 jena-arq/testing/ARQ/General/bad-lex-1.ttl         |   9 -
 jena-arq/testing/ARQ/General/bad-lex-2.rq          |   9 -
 jena-arq/testing/ARQ/General/bad-lex-2.ttl         |   9 -
 jena-arq/testing/ARQ/General/manifest.ttl          |  39 --
 jena-arq/testing/ARQ/GroupBy/agg-1.rq              |   1 -
 jena-arq/testing/ARQ/GroupBy/agg-1.srj             |  13 -
 jena-arq/testing/ARQ/GroupBy/agg-2.rq              |   2 -
 jena-arq/testing/ARQ/GroupBy/agg-2.srj             |  13 -
 jena-arq/testing/ARQ/GroupBy/avg-01.rq             |   7 -
 jena-arq/testing/ARQ/GroupBy/avg-01.srj            |  12 -
 jena-arq/testing/ARQ/GroupBy/count-01.arq          |   7 -
 jena-arq/testing/ARQ/GroupBy/count-01.srx          |  16 -
 jena-arq/testing/ARQ/GroupBy/count-02.rq           |   7 -
 jena-arq/testing/ARQ/GroupBy/count-02.srx          |  16 -
 jena-arq/testing/ARQ/GroupBy/count-03.rq           |   9 -
 jena-arq/testing/ARQ/GroupBy/count-03.srx          |  36 -
 jena-arq/testing/ARQ/GroupBy/count-04.rq           |  10 -
 jena-arq/testing/ARQ/GroupBy/count-04.srx          |  36 -
 jena-arq/testing/ARQ/GroupBy/count-05.rq           |  12 -
 jena-arq/testing/ARQ/GroupBy/count-05.srx          |  46 --
 jena-arq/testing/ARQ/GroupBy/count-06.rq           |  13 -
 jena-arq/testing/ARQ/GroupBy/count-06.srx          |  46 --
 jena-arq/testing/ARQ/GroupBy/count-07.rq           |   7 -
 jena-arq/testing/ARQ/GroupBy/count-07.srx          |  20 -
 jena-arq/testing/ARQ/GroupBy/count-10.rq           |   7 -
 jena-arq/testing/ARQ/GroupBy/count-10.srx          |  13 -
 jena-arq/testing/ARQ/GroupBy/count-11.rq           |   8 -
 jena-arq/testing/ARQ/GroupBy/count-11.srx          |   8 -
 jena-arq/testing/ARQ/GroupBy/count-12.rq           |   7 -
 jena-arq/testing/ARQ/GroupBy/count-12.srx          |  13 -
 jena-arq/testing/ARQ/GroupBy/count-13.rq           |   8 -
 jena-arq/testing/ARQ/GroupBy/count-13.srx          |   8 -
 jena-arq/testing/ARQ/GroupBy/count-20.arq          |  11 -
 jena-arq/testing/ARQ/GroupBy/count-20.srx          |  16 -
 jena-arq/testing/ARQ/GroupBy/count-21.arq          |  11 -
 jena-arq/testing/ARQ/GroupBy/count-21.srx          |  13 -
 jena-arq/testing/ARQ/GroupBy/count-22.arq          |  12 -
 jena-arq/testing/ARQ/GroupBy/count-22.srx          |  33 -
 jena-arq/testing/ARQ/GroupBy/count-23.arq          |  11 -
 jena-arq/testing/ARQ/GroupBy/count-23.srx          |  30 -
 jena-arq/testing/ARQ/GroupBy/data-0.ttl            |   0
 jena-arq/testing/ARQ/GroupBy/data-1.ttl            |  49 --
 jena-arq/testing/ARQ/GroupBy/data-2.ttl            |  49 --
 jena-arq/testing/ARQ/GroupBy/group-01.rq           |  10 -
 jena-arq/testing/ARQ/GroupBy/group-01.srx          |  26 -
 jena-arq/testing/ARQ/GroupBy/group-02.rq           |  11 -
 jena-arq/testing/ARQ/GroupBy/group-02.srx          |  44 --
 jena-arq/testing/ARQ/GroupBy/group-03.rq           |  11 -
 jena-arq/testing/ARQ/GroupBy/group-03.srx          |  13 -
 jena-arq/testing/ARQ/GroupBy/group-04.rq           |  11 -
 jena-arq/testing/ARQ/GroupBy/group-04.srx          |  31 -
 jena-arq/testing/ARQ/GroupBy/group-05.arq          |  11 -
 jena-arq/testing/ARQ/GroupBy/group-05.srx          |  60 --
 jena-arq/testing/ARQ/GroupBy/group-06.arq          |  11 -
 jena-arq/testing/ARQ/GroupBy/group-06.srx          |  36 -
 jena-arq/testing/ARQ/GroupBy/group-10.rq           |   9 -
 jena-arq/testing/ARQ/GroupBy/group-10.srx          |  23 -
 jena-arq/testing/ARQ/GroupBy/group-11.rq           |   9 -
 jena-arq/testing/ARQ/GroupBy/group-11.srx          |  13 -
 jena-arq/testing/ARQ/GroupBy/group-12.arq          |  11 -
 jena-arq/testing/ARQ/GroupBy/group-12.srx          |  23 -
 jena-arq/testing/ARQ/GroupBy/group-20.rq           |   8 -
 jena-arq/testing/ARQ/GroupBy/group-20.srx          |   8 -
 jena-arq/testing/ARQ/GroupBy/having-1.rq           |  10 -
 jena-arq/testing/ARQ/GroupBy/having-1.srx          |  20 -
 jena-arq/testing/ARQ/GroupBy/manifest.ttl          | 312 ---------
 jena-arq/testing/ARQ/GroupBy/max-01.rq             |   7 -
 jena-arq/testing/ARQ/GroupBy/max-01.srj            |  12 -
 jena-arq/testing/ARQ/GroupBy/median-01.arq         |   7 -
 jena-arq/testing/ARQ/GroupBy/median-01.srj         |  12 -
 jena-arq/testing/ARQ/GroupBy/min-01.rq             |   7 -
 jena-arq/testing/ARQ/GroupBy/min-01.srj            |  12 -
 jena-arq/testing/ARQ/GroupBy/mode-01.arq           |   7 -
 jena-arq/testing/ARQ/GroupBy/mode-01.srj           |  12 -
 jena-arq/testing/ARQ/GroupBy/sum-01.rq             |   7 -
 jena-arq/testing/ARQ/GroupBy/sum-01.srj            |  12 -
 jena-arq/testing/ARQ/Negation/data-1.ttl           |  13 -
 jena-arq/testing/ARQ/Negation/manifest.ttl         |  83 ---
 jena-arq/testing/ARQ/Negation/neg-01.arq           |   7 -
 jena-arq/testing/ARQ/Negation/neg-01.srj           |   1 -
 jena-arq/testing/ARQ/Negation/neg-02.arq           |   7 -
 jena-arq/testing/ARQ/Negation/neg-02.srj           |   1 -
 jena-arq/testing/ARQ/Negation/neg-03.arq           |   7 -
 jena-arq/testing/ARQ/Negation/neg-03.srj           |   1 -
 jena-arq/testing/ARQ/Negation/neg-04.arq           |   7 -
 jena-arq/testing/ARQ/Negation/neg-04.srj           |   1 -
 jena-arq/testing/ARQ/Negation/neg-05.arq           |   7 -
 jena-arq/testing/ARQ/Negation/neg-05.srj           |   1 -
 jena-arq/testing/ARQ/Negation/neg-06.arq           |   7 -
 jena-arq/testing/ARQ/Negation/neg-06.srj           |  12 -
 jena-arq/testing/ARQ/Negation/neg-07.arq           |   8 -
 jena-arq/testing/ARQ/Negation/neg-07.srj           |  18 -
 jena-arq/testing/ARQ/Negation/neg-08.arq           |   9 -
 jena-arq/testing/ARQ/Negation/neg-08.srj           |  13 -
 jena-arq/testing/ARQ/OpenWorld/data-1.ttl          |  17 -
 jena-arq/testing/ARQ/OpenWorld/data-2.ttl          |  20 -
 jena-arq/testing/ARQ/OpenWorld/data-3.ttl          |  15 -
 jena-arq/testing/ARQ/OpenWorld/data-4.ttl          |  15 -
 jena-arq/testing/ARQ/OpenWorld/date-1-result.srx   |  20 -
 jena-arq/testing/ARQ/OpenWorld/date-1.rq           |   8 -
 jena-arq/testing/ARQ/OpenWorld/date-2-result.srx   |  36 -
 jena-arq/testing/ARQ/OpenWorld/date-2.rq           |   8 -
 jena-arq/testing/ARQ/OpenWorld/date-3-result.srx   |  36 -
 jena-arq/testing/ARQ/OpenWorld/date-3.rq           |   8 -
 jena-arq/testing/ARQ/OpenWorld/date-4-result.srx   |  36 -
 jena-arq/testing/ARQ/OpenWorld/date-4.rq           |   8 -
 jena-arq/testing/ARQ/OpenWorld/manifest.ttl        | 138 ----
 .../testing/ARQ/OpenWorld/open-cmp-01-result.srx   |  24 -
 jena-arq/testing/ARQ/OpenWorld/open-cmp-01.rq      |   8 -
 .../testing/ARQ/OpenWorld/open-cmp-02-result.srx   |  46 --
 jena-arq/testing/ARQ/OpenWorld/open-cmp-02.rq      |   8 -
 .../testing/ARQ/OpenWorld/open-eq-01-result.srx    |  11 -
 jena-arq/testing/ARQ/OpenWorld/open-eq-01.rq       |  13 -
 .../testing/ARQ/OpenWorld/open-eq-02-result.srx    |  16 -
 jena-arq/testing/ARQ/OpenWorld/open-eq-02.rq       |   8 -
 .../testing/ARQ/OpenWorld/open-eq-03-result.srx    |  28 -
 jena-arq/testing/ARQ/OpenWorld/open-eq-03.rq       |  14 -
 .../testing/ARQ/OpenWorld/open-eq-04-result.srx    |  28 -
 jena-arq/testing/ARQ/OpenWorld/open-eq-04.rq       |  14 -
 .../testing/ARQ/OpenWorld/open-eq-05-result.srx    |  20 -
 jena-arq/testing/ARQ/OpenWorld/open-eq-05.rq       |  11 -
 .../testing/ARQ/OpenWorld/open-eq-06-result.srx    |  12 -
 jena-arq/testing/ARQ/OpenWorld/open-eq-06.rq       |  12 -
 .../testing/ARQ/OpenWorld/open-eq-07-result.srx    | 182 -----
 jena-arq/testing/ARQ/OpenWorld/open-eq-07.rq       |   9 -
 .../testing/ARQ/OpenWorld/open-eq-08-result.srx    | 602 -----------------
 jena-arq/testing/ARQ/OpenWorld/open-eq-08.rq       |   9 -
 .../testing/ARQ/OpenWorld/open-eq-09-result.srx    |  14 -
 jena-arq/testing/ARQ/OpenWorld/open-eq-09.rq       |   9 -
 .../testing/ARQ/OpenWorld/open-eq-10-result.srx    | 742 ---------------------
 jena-arq/testing/ARQ/OpenWorld/open-eq-10.rq       |   9 -
 .../testing/ARQ/OpenWorld/open-eq-11-result.srx    | 742 ---------------------
 jena-arq/testing/ARQ/OpenWorld/open-eq-11.rq       |   9 -
 .../testing/ARQ/OpenWorld/open-eq-12-result.srx    | 154 -----
 jena-arq/testing/ARQ/OpenWorld/open-eq-12.rq       |  10 -
 jena-arq/testing/ARQ/OptFilterEquality/data-3.ttl  |   3 -
 jena-arq/testing/ARQ/OptFilterEquality/data-4.ttl  |   7 -
 .../ARQ/OptFilterEquality/filter-equality-01.rq    |   8 -
 .../ARQ/OptFilterEquality/filter-equality-01.srj   |  13 -
 .../ARQ/OptFilterEquality/filter-equality-02.rq    |   8 -
 .../ARQ/OptFilterEquality/filter-equality-02.srj   |  10 -
 .../ARQ/OptFilterEquality/filter-equality-03.rq    |   7 -
 .../ARQ/OptFilterEquality/filter-equality-03.srj   |  13 -
 .../ARQ/OptFilterEquality/filter-equality-04.rq    |   8 -
 .../ARQ/OptFilterEquality/filter-equality-04.srj   |  13 -
 .../ARQ/OptFilterEquality/filter-equality-05.rq    |   8 -
 .../ARQ/OptFilterEquality/filter-equality-05.srj   |  13 -
 .../ARQ/OptFilterEquality/filter-equality-06.rq    |   8 -
 .../ARQ/OptFilterEquality/filter-equality-06.srj   |  13 -
 .../ARQ/OptFilterEquality/filter-equality-07.rq    |   7 -
 .../ARQ/OptFilterEquality/filter-equality-07.srj   |  10 -
 .../ARQ/OptFilterEquality/filter-equality-08.rq    |   8 -
 .../ARQ/OptFilterEquality/filter-equality-08.srj   |  10 -
 .../ARQ/OptFilterEquality/filter-equality-10.rq    |  10 -
 .../ARQ/OptFilterEquality/filter-equality-10.srj   |  10 -
 .../ARQ/OptFilterEquality/filter-equality-11.rq    |  13 -
 .../ARQ/OptFilterEquality/filter-equality-11.srj   |  15 -
 .../ARQ/OptFilterEquality/filter-equality-12.rq    |  13 -
 .../ARQ/OptFilterEquality/filter-equality-12.srj   |  15 -
 .../ARQ/OptFilterEquality/filter-equality-13.rq    |   8 -
 .../ARQ/OptFilterEquality/filter-equality-13.srj   |  13 -
 .../ARQ/OptFilterEquality/filter-equality-14.rq    |   8 -
 .../ARQ/OptFilterEquality/filter-equality-14.srj   |  14 -
 .../testing/ARQ/OptFilterEquality/manifest.ttl     | 123 ----
 jena-arq/testing/ARQ/Optimization/data-1.ttl       |   7 -
 jena-arq/testing/ARQ/Optimization/data-2.ttl       |  26 -
 jena-arq/testing/ARQ/Optimization/manifest.ttl     | 297 ---------
 .../ARQ/Optimization/opt-distinct-to-reduced-01.rq |   5 -
 .../Optimization/opt-distinct-to-reduced-01.srj    |  69 --
 .../ARQ/Optimization/opt-distinct-to-reduced-02.rq |   6 -
 .../Optimization/opt-distinct-to-reduced-02.srj    |  27 -
 .../ARQ/Optimization/opt-distinct-to-reduced-03.rq |   5 -
 .../Optimization/opt-distinct-to-reduced-03.srj    |  69 --
 jena-arq/testing/ARQ/Optimization/opt-equals-01.rq |   6 -
 .../testing/ARQ/Optimization/opt-equals-01.srx     |  25 -
 jena-arq/testing/ARQ/Optimization/opt-equals-02.rq |   6 -
 .../testing/ARQ/Optimization/opt-equals-02.srx     |  25 -
 jena-arq/testing/ARQ/Optimization/opt-equals-03.rq |   6 -
 .../testing/ARQ/Optimization/opt-equals-03.srx     |  25 -
 jena-arq/testing/ARQ/Optimization/opt-equals-04.rq |   8 -
 .../testing/ARQ/Optimization/opt-equals-04.srx     |  17 -
 jena-arq/testing/ARQ/Optimization/opt-equals-05.rq |   8 -
 .../testing/ARQ/Optimization/opt-equals-05.srx     |  17 -
 jena-arq/testing/ARQ/Optimization/opt-equals-06.rq |   8 -
 .../testing/ARQ/Optimization/opt-equals-06.srx     |  17 -
 jena-arq/testing/ARQ/Optimization/opt-equals-07.rq |   9 -
 .../testing/ARQ/Optimization/opt-equals-07.srx     |  25 -
 jena-arq/testing/ARQ/Optimization/opt-equals-08.rq |  11 -
 .../testing/ARQ/Optimization/opt-equals-08.srx     |  17 -
 jena-arq/testing/ARQ/Optimization/opt-equals-09.rq |  11 -
 .../testing/ARQ/Optimization/opt-equals-09.srx     |  25 -
 jena-arq/testing/ARQ/Optimization/opt-equals-10.rq |  13 -
 .../testing/ARQ/Optimization/opt-equals-10.srx     |  17 -
 .../testing/ARQ/Optimization/opt-sameTerm-01.rq    |   6 -
 .../testing/ARQ/Optimization/opt-sameTerm-01.srx   |  17 -
 .../testing/ARQ/Optimization/opt-sameTerm-02.rq    |   6 -
 .../testing/ARQ/Optimization/opt-sameTerm-02.srx   |   9 -
 .../testing/ARQ/Optimization/opt-sameTerm-03.rq    |   6 -
 .../testing/ARQ/Optimization/opt-sameTerm-03.srx   |  25 -
 .../testing/ARQ/Optimization/opt-sameTerm-04.rq    |   8 -
 .../testing/ARQ/Optimization/opt-sameTerm-04.srx   |  17 -
 .../testing/ARQ/Optimization/opt-sameTerm-05.rq    |   8 -
 .../testing/ARQ/Optimization/opt-sameTerm-05.srx   |  17 -
 .../testing/ARQ/Optimization/opt-sameTerm-06.rq    |   8 -
 .../testing/ARQ/Optimization/opt-sameTerm-06.srx   |  17 -
 .../testing/ARQ/Optimization/opt-sameTerm-07.rq    |   9 -
 .../testing/ARQ/Optimization/opt-sameTerm-07.srx   |  25 -
 .../testing/ARQ/Optimization/opt-sameTerm-08.rq    |  11 -
 .../testing/ARQ/Optimization/opt-sameTerm-08.srx   |  17 -
 .../testing/ARQ/Optimization/opt-sameTerm-09.rq    |  11 -
 .../testing/ARQ/Optimization/opt-sameTerm-09.srx   |  25 -
 .../testing/ARQ/Optimization/opt-sameTerm-10.rq    |  13 -
 .../testing/ARQ/Optimization/opt-sameTerm-10.srx   |  17 -
 jena-arq/testing/ARQ/Optimization/opt-top-01.rq    |   6 -
 jena-arq/testing/ARQ/Optimization/opt-top-01.srj   |  29 -
 jena-arq/testing/ARQ/Optimization/opt-top-02.rq    |   6 -
 jena-arq/testing/ARQ/Optimization/opt-top-02.srj   |  29 -
 jena-arq/testing/ARQ/Optimization/opt-top-03.rq    |   7 -
 jena-arq/testing/ARQ/Optimization/opt-top-03.srj   | 105 ---
 jena-arq/testing/ARQ/Optimization/opt-top-04.rq    |   6 -
 jena-arq/testing/ARQ/Optimization/opt-top-04.srj   | 105 ---
 jena-arq/testing/ARQ/Optimization/opt-top-05.rq    |   6 -
 jena-arq/testing/ARQ/Optimization/opt-top-05.srj   |  29 -
 jena-arq/testing/ARQ/Optimization/opt-top-06.rq    |   6 -
 jena-arq/testing/ARQ/Optimization/opt-top-06.srj   |  29 -
 jena-arq/testing/ARQ/Optimization/opt-top-07.rq    |   7 -
 jena-arq/testing/ARQ/Optimization/opt-top-07.srj   | 105 ---
 jena-arq/testing/ARQ/Optimization/opt-top-08.rq    |   6 -
 jena-arq/testing/ARQ/Optimization/opt-top-08.srj   | 105 ---
 jena-arq/testing/ARQ/Optimization/opt-top-09.rq    |   6 -
 jena-arq/testing/ARQ/Optimization/opt-top-09.srj   |  24 -
 jena-arq/testing/ARQ/Optimization/opt-top-10.rq    |   6 -
 jena-arq/testing/ARQ/Optimization/opt-top-10.srj   |  24 -
 jena-arq/testing/ARQ/Optimization/opt-top-11.rq    |   7 -
 jena-arq/testing/ARQ/Optimization/opt-top-11.srj   |  29 -
 jena-arq/testing/ARQ/Optimization/opt-top-12.rq    |   7 -
 jena-arq/testing/ARQ/Optimization/opt-top-12.srj   |  24 -
 jena-arq/testing/ARQ/Optimization/opt-top-13.rq    |   6 -
 jena-arq/testing/ARQ/Optimization/opt-top-13.srj   |  24 -
 jena-arq/testing/ARQ/Optional/data.ttl             |  11 -
 jena-arq/testing/ARQ/Optional/manifest.ttl         | 105 ---
 jena-arq/testing/ARQ/Optional/opt-01.rq            |   7 -
 jena-arq/testing/ARQ/Optional/opt-01.srx           |  33 -
 jena-arq/testing/ARQ/Optional/opt-02.rq            |   8 -
 jena-arq/testing/ARQ/Optional/opt-02.srx           |  40 --
 jena-arq/testing/ARQ/Optional/opt-03.rq            |   9 -
 jena-arq/testing/ARQ/Optional/opt-03.srx           |  37 -
 jena-arq/testing/ARQ/Optional/opt-04.rq            |   6 -
 jena-arq/testing/ARQ/Optional/opt-04.srx           |  28 -
 jena-arq/testing/ARQ/Optional/opt-05.rq            |   7 -
 jena-arq/testing/ARQ/Optional/opt-05.srx           |  25 -
 jena-arq/testing/ARQ/Optional/opt-06.rq            |   7 -
 jena-arq/testing/ARQ/Optional/opt-06.srx           |  25 -
 jena-arq/testing/ARQ/Optional/opt-07.rq            |   9 -
 jena-arq/testing/ARQ/Optional/opt-07.srx           |  25 -
 jena-arq/testing/ARQ/Optional/opt-08.rq            |   9 -
 jena-arq/testing/ARQ/Optional/opt-08.srx           |  25 -
 jena-arq/testing/ARQ/Optional/opt-10.rq            |   8 -
 jena-arq/testing/ARQ/Optional/opt-10.srx           |  26 -
 jena-arq/testing/ARQ/Optional/opt-11.rq            |   8 -
 jena-arq/testing/ARQ/Optional/opt-11.srx           |  26 -
 jena-arq/testing/ARQ/OrderBy/data-sort-1.ttl       |   7 -
 jena-arq/testing/ARQ/OrderBy/data-sort-3.ttl       |  17 -
 jena-arq/testing/ARQ/OrderBy/data-sort-4.ttl       |  22 -
 jena-arq/testing/ARQ/OrderBy/data-sort-6.ttl       |  20 -
 jena-arq/testing/ARQ/OrderBy/data-sort-7.ttl       |  19 -
 jena-arq/testing/ARQ/OrderBy/data-sort-8.ttl       |  13 -
 jena-arq/testing/ARQ/OrderBy/data-sort-9.ttl       |  10 -
 jena-arq/testing/ARQ/OrderBy/manifest.ttl          |  98 ---
 jena-arq/testing/ARQ/OrderBy/query-sort-1.rq       |   4 -
 jena-arq/testing/ARQ/OrderBy/query-sort-10.rq      |   4 -
 jena-arq/testing/ARQ/OrderBy/query-sort-2.rq       |   4 -
 jena-arq/testing/ARQ/OrderBy/query-sort-3.rq       |   6 -
 jena-arq/testing/ARQ/OrderBy/query-sort-4.rq       |   8 -
 jena-arq/testing/ARQ/OrderBy/query-sort-5.rq       |   8 -
 jena-arq/testing/ARQ/OrderBy/query-sort-6.rq       |   5 -
 jena-arq/testing/ARQ/OrderBy/query-sort-9.rq       |   4 -
 jena-arq/testing/ARQ/OrderBy/result-sort-1.rdf     |  38 --
 jena-arq/testing/ARQ/OrderBy/result-sort-10.rdf    |  38 --
 jena-arq/testing/ARQ/OrderBy/result-sort-2.rdf     |  38 --
 jena-arq/testing/ARQ/OrderBy/result-sort-3.rdf     |  56 --
 jena-arq/testing/ARQ/OrderBy/result-sort-4.rdf     |  71 --
 jena-arq/testing/ARQ/OrderBy/result-sort-5.rdf     |  72 --
 jena-arq/testing/ARQ/OrderBy/result-sort-6.rdf     |  42 --
 jena-arq/testing/ARQ/OrderBy/result-sort-7.rdf     |  59 --
 jena-arq/testing/ARQ/OrderBy/result-sort-8.rdf     |  48 --
 jena-arq/testing/ARQ/OrderBy/result-sort-9.rdf     |  38 --
 jena-arq/testing/ARQ/Paths/data-1.ttl              |  30 -
 jena-arq/testing/ARQ/Paths/data-2.ttl              |  29 -
 jena-arq/testing/ARQ/Paths/manifest.ttl            | 112 ----
 jena-arq/testing/ARQ/Paths/path-01.arq             |  10 -
 jena-arq/testing/ARQ/Paths/path-01.srx             |  13 -
 jena-arq/testing/ARQ/Paths/path-02.arq             |  10 -
 jena-arq/testing/ARQ/Paths/path-02.srx             |  28 -
 jena-arq/testing/ARQ/Paths/path-03.arq             |  12 -
 jena-arq/testing/ARQ/Paths/path-03.srx             |  13 -
 jena-arq/testing/ARQ/Paths/path-04.arq             |  10 -
 jena-arq/testing/ARQ/Paths/path-04.srx             |  25 -
 jena-arq/testing/ARQ/Paths/path-05.arq             |  10 -
 jena-arq/testing/ARQ/Paths/path-05.srx             |  13 -
 jena-arq/testing/ARQ/Paths/path-06.arq             |   6 -
 jena-arq/testing/ARQ/Paths/path-06.srj             |  13 -
 jena-arq/testing/ARQ/Paths/path-07.arq             |   6 -
 jena-arq/testing/ARQ/Paths/path-07.srj             |  13 -
 jena-arq/testing/ARQ/Paths/path-10.arq             |  11 -
 jena-arq/testing/ARQ/Paths/path-10.srx             |  57 --
 jena-arq/testing/ARQ/Paths/path-11.arq             |  11 -
 jena-arq/testing/ARQ/Paths/path-11.srx             |  13 -
 jena-arq/testing/ARQ/Paths/path-20.arq             |  10 -
 jena-arq/testing/ARQ/Paths/path-20.srx             |  28 -
 jena-arq/testing/ARQ/Paths/path-21.arq             |  10 -
 jena-arq/testing/ARQ/Paths/path-21.srx             |  23 -
 jena-arq/testing/ARQ/Paths/path-22.arq             |  11 -
 jena-arq/testing/ARQ/Paths/path-22.srx             |  89 ---
 jena-arq/testing/ARQ/Planning/README               |   8 -
 jena-arq/testing/ARQ/Planning/data-1.ttl           |   5 -
 .../testing/ARQ/Planning/manifest-no-reorder.ttl   |  66 --
 jena-arq/testing/ARQ/Planning/manifest-reorder.ttl |  46 --
 jena-arq/testing/ARQ/Planning/manifest.ttl         |  66 --
 jena-arq/testing/ARQ/Planning/q-opt-1.rq           |  10 -
 jena-arq/testing/ARQ/Planning/q-opt-2.rq           |   9 -
 jena-arq/testing/ARQ/Planning/q-opt-3.rq           |  24 -
 jena-arq/testing/ARQ/Planning/results-1.ttl        |  10 -
 jena-arq/testing/ARQ/Planning/results-2.ttl        |   6 -
 jena-arq/testing/ARQ/Planning/results-3.ttl        |  25 -
 jena-arq/testing/ARQ/Planning/results-4.ttl        |  18 -
 jena-arq/testing/ARQ/RDQL-SPARQL.txt               |  30 -
 jena-arq/testing/ARQ/README                        |   3 -
 jena-arq/testing/ARQ/SPARQL11_RDF11.txt            |  29 -
 jena-arq/testing/ARQ/Select/data-1.ttl             |   4 -
 jena-arq/testing/ARQ/Select/manifest.ttl           |  75 ---
 jena-arq/testing/ARQ/Select/query-select-0.rq      |   1 -
 jena-arq/testing/ARQ/Select/query-select-1.rq      |   1 -
 jena-arq/testing/ARQ/Select/query-select-2.rq      |   4 -
 jena-arq/testing/ARQ/Select/query-select-3.rq      |   4 -
 jena-arq/testing/ARQ/Select/query-select-4.rq      |   4 -
 jena-arq/testing/ARQ/Select/query-select-5.rq      |   2 -
 jena-arq/testing/ARQ/Select/results-select-0.ttl   |   6 -
 jena-arq/testing/ARQ/Select/results-select-1.ttl   |   7 -
 jena-arq/testing/ARQ/Select/results-select-2.ttl   |  10 -
 jena-arq/testing/ARQ/Select/results-select-3.ttl   |  11 -
 jena-arq/testing/ARQ/Select/results-select-4.ttl   |  10 -
 jena-arq/testing/ARQ/Select/results-select-5.srx   |  10 -
 jena-arq/testing/ARQ/SelectExpr/data.ttl           |  30 -
 jena-arq/testing/ARQ/SelectExpr/manifest.ttl       |  68 --
 jena-arq/testing/ARQ/SelectExpr/select-expr-01.arq |   8 -
 jena-arq/testing/ARQ/SelectExpr/select-expr-01.srx |  64 --
 jena-arq/testing/ARQ/SelectExpr/select-expr-02.arq |   7 -
 jena-arq/testing/ARQ/SelectExpr/select-expr-02.srx |  64 --
 jena-arq/testing/ARQ/SelectExpr/select-expr-03.arq |   5 -
 jena-arq/testing/ARQ/SelectExpr/select-expr-03.srx |  16 -
 jena-arq/testing/ARQ/SelectExpr/select-expr-04.arq |   8 -
 jena-arq/testing/ARQ/SelectExpr/select-expr-04.srx |  45 --
 jena-arq/testing/ARQ/SelectExpr/select-expr-05.arq |   8 -
 jena-arq/testing/ARQ/SelectExpr/select-expr-05.srx |  70 --
 jena-arq/testing/ARQ/SelectExpr/select-expr-06.arq |   8 -
 jena-arq/testing/ARQ/SelectExpr/select-expr-06.srx |  70 --
 jena-arq/testing/ARQ/SolutionSeq/data-1.ttl        |  17 -
 jena-arq/testing/ARQ/SolutionSeq/data-2.ttl        |   6 -
 jena-arq/testing/ARQ/SolutionSeq/manifest.ttl      | 109 ---
 jena-arq/testing/ARQ/SolutionSeq/q-seq-01.rq       |   4 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-02.rq       |   4 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-03.rq       |   5 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-04.rq       |   5 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-05.rq       |   4 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-06.rq       |   5 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-07.rq       |   6 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-08.rq       |   6 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-09.rq       |   6 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-10.rq       |   7 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-11.rq       |   5 -
 jena-arq/testing/ARQ/SolutionSeq/q-seq-12.rq       |   5 -
 .../testing/ARQ/SolutionSeq/results-seq-01.ttl     |  38 --
 .../testing/ARQ/SolutionSeq/results-seq-02.ttl     |  26 -
 .../testing/ARQ/SolutionSeq/results-seq-03.ttl     |  46 --
 .../testing/ARQ/SolutionSeq/results-seq-04.ttl     |  31 -
 .../testing/ARQ/SolutionSeq/results-seq-05.ttl     |  26 -
 .../testing/ARQ/SolutionSeq/results-seq-06.ttl     |  31 -
 .../testing/ARQ/SolutionSeq/results-seq-07.ttl     |  21 -
 .../testing/ARQ/SolutionSeq/results-seq-08.ttl     |  16 -
 .../testing/ARQ/SolutionSeq/results-seq-09.ttl     |  16 -
 .../testing/ARQ/SolutionSeq/results-seq-10.ttl     |  16 -
 .../testing/ARQ/SolutionSeq/results-seq-11.ttl     |  26 -
 .../testing/ARQ/SolutionSeq/results-seq-12.ttl     |  26 -
 jena-arq/testing/ARQ/Sort/data-1.ttl               |  36 -
 jena-arq/testing/ARQ/Sort/data-2.ttl               |  16 -
 jena-arq/testing/ARQ/Sort/data-3.ttl               |  27 -
 jena-arq/testing/ARQ/Sort/manifest.ttl             |  65 --
 jena-arq/testing/ARQ/Sort/order-1.rq               |   4 -
 jena-arq/testing/ARQ/Sort/order-2.rq               |   6 -
 jena-arq/testing/ARQ/Sort/order-3.rq               |   5 -
 jena-arq/testing/ARQ/Sort/order-result-1.ttl       |  53 --
 jena-arq/testing/ARQ/Sort/order-result-2.ttl       |  65 --
 jena-arq/testing/ARQ/Sort/order-result-3.ttl       |  66 --
 jena-arq/testing/ARQ/Sort/sort-1.rq                |   7 -
 jena-arq/testing/ARQ/Sort/sort-2.rq                |   8 -
 jena-arq/testing/ARQ/Sort/sort-3.rq                |   8 -
 jena-arq/testing/ARQ/Sort/sort-result-1.ttl        |  93 ---
 jena-arq/testing/ARQ/Sort/sort-result-2.ttl        | 168 -----
 jena-arq/testing/ARQ/Sort/sort-result-3.ttl        | 168 -----
 jena-arq/testing/ARQ/SubQuery/data-sq.ttl          |   4 -
 jena-arq/testing/ARQ/SubQuery/data.ttl             |  27 -
 jena-arq/testing/ARQ/SubQuery/graph-subquery-1.rq  |   9 -
 jena-arq/testing/ARQ/SubQuery/graph-subquery-1.srj |  17 -
 jena-arq/testing/ARQ/SubQuery/manifest.ttl         |  63 --
 jena-arq/testing/ARQ/SubQuery/sub-select-01.rq     |   6 -
 jena-arq/testing/ARQ/SubQuery/sub-select-01.srx    |  48 --
 jena-arq/testing/ARQ/SubQuery/sub-select-02.rq     |   6 -
 jena-arq/testing/ARQ/SubQuery/sub-select-02.srx    |  48 --
 jena-arq/testing/ARQ/SubQuery/sub-select-03.rq     |   7 -
 jena-arq/testing/ARQ/SubQuery/sub-select-03.srx    |  65 --
 jena-arq/testing/ARQ/SubQuery/sub-select-04.rq     |   8 -
 jena-arq/testing/ARQ/SubQuery/sub-select-04.srx    |  87 ---
 .../ARQ/{Syntax => }/Syntax-ARQ/manifest.ttl       |   0
 .../Syntax-ARQ/syntax-agg-expr-bad-01.arq          |   0
 .../Syntax-ARQ/syntax-agg-expr-bad-02.arq          |   0
 .../Syntax-ARQ/syntax-agg-expr-bad-03.arq          |   0
 .../{Syntax => }/Syntax-ARQ/syntax-count-01.arq    |   0
 .../{Syntax => }/Syntax-ARQ/syntax-count-02.arq    |   0
 .../{Syntax => }/Syntax-ARQ/syntax-count-03.arq    |   0
 .../{Syntax => }/Syntax-ARQ/syntax-count-04.arq    |   0
 .../Syntax-ARQ/syntax-delim-hex-escape-01.arq      |   0
 .../Syntax-ARQ/syntax-delim-hex-escape-02.arq      |   0
 .../Syntax-ARQ/syntax-delim-hex-escape-03.arq      |   0
 .../Syntax-ARQ/syntax-delim-hex-escape-04.arq      |   0
 .../Syntax-ARQ/syntax-delim-hex-escape-05.arq      |   0
 .../Syntax-ARQ/syntax-delim-hex-escape-bad-01.arq  |   0
 .../Syntax-ARQ/syntax-delim-hex-escape-bad-02.arq  |   0
 .../Syntax-ARQ/syntax-delim-hex-escape-bad-03.arq  |   0
 .../Syntax-ARQ/syntax-delim-hex-escape-bad-04.arq  |   0
 .../{Syntax => }/Syntax-ARQ/syntax-group-01.arq    |   0
 .../{Syntax => }/Syntax-ARQ/syntax-group-02.arq    |   0
 .../{Syntax => }/Syntax-ARQ/syntax-group-03.arq    |   0
 .../{Syntax => }/Syntax-ARQ/syntax-group-04.arq    |   0
 .../ARQ/{Syntax => }/Syntax-ARQ/syntax-let-01.arq  |   0
 .../ARQ/{Syntax => }/Syntax-ARQ/syntax-let-02.arq  |   0
 .../{Syntax => }/Syntax-ARQ/syntax-let-bad-01.arq  |   0
 .../{Syntax => }/Syntax-ARQ/syntax-median-01.arq   |   0
 .../Syntax-ARQ/syntax-quad-construct-01.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-02.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-03.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-04.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-05.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-06.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-07.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-08.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-09.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-10.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-11.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-12.arq        |   0
 .../Syntax-ARQ/syntax-quad-construct-bad-01.arq    |   0
 .../Syntax-ARQ/syntax-scope-bad-01.arq             |   0
 .../Syntax-ARQ/syntax-scope-bad-02.arq             |   0
 .../Syntax-ARQ/syntax-select-expr-01.arq           |   0
 .../Syntax-ARQ/syntax-select-expr-02.arq           |   0
 .../Syntax-ARQ/syntax-select-expr-03.arq           |   0
 .../Syntax-ARQ/syntax-select-expr-04.arq           |   0
 .../Syntax-ARQ/syntax-select-expr-05.arq           |   0
 .../Syntax-ARQ/syntax-select-expr-06.arq           |   0
 .../Syntax-ARQ/syntax-select-expr-07.arq           |   0
 .../{Syntax => }/Syntax-ARQ/syntax-service-01.arq  |   0
 .../{Syntax => }/Syntax-ARQ/syntax-subquery-01.arq |   0
 .../{Syntax => }/Syntax-ARQ/syntax-subquery-02.arq |   0
 .../{Syntax => }/Syntax-ARQ/syntax-subquery-03.arq |   0
 .../{Syntax => }/Syntax-ARQ/syntax-subquery-04.arq |   0
 .../Syntax-ARQ/syntax-subquery-bad-01.arq          |   0
 .../Syntax-ARQ/syntax-subquery-bad-02.arq          |   0
 .../ARQ/{Syntax => }/Syntax-Lateral/manifest.ttl   |   0
 .../Syntax-Lateral/syntax-lateral-01.arq           |   0
 .../Syntax-Lateral/syntax-lateral-02.arq           |   0
 .../Syntax-Lateral/syntax-lateral-03.arq           |   0
 .../Syntax-Lateral/syntax-lateral-04.arq           |   0
 .../Syntax-Lateral/syntax-lateral-05.arq           |   0
 .../Syntax-Lateral/syntax-lateral-bad-01.arq       |   0
 .../Syntax-Lateral/syntax-lateral-bad-02.arq       |   0
 .../Syntax-Lateral/syntax-lateral-bad-03.arq       |   0
 .../Syntax-Lateral/syntax-lateral-bad-04.arq       |   0
 .../Syntax-Lateral/syntax-lateral-bad-05.arq       |   0
 .../Syntax-Lateral/syntax-lateral-bad-06.arq       |   0
 .../Syntax-Lateral/syntax-lateral-bad-07.arq       |   0
 .../Syntax-Lateral/syntax-lateral-bad-08.arq       |   0
 .../ARQ/Syntax/Syntax-SPARQL-Fed/manifest.ttl      |  49 --
 .../Syntax/Syntax-SPARQL-Fed/syntax-service-01.rq  |   1 -
 .../Syntax/Syntax-SPARQL-Fed/syntax-service-02.rq  |   1 -
 .../Syntax/Syntax-SPARQL-Fed/syntax-service-03.rq  |   1 -
 .../Syntax-SPARQL-Update-2/large-request-01.ru     | 141 ----
 .../ARQ/Syntax/Syntax-SPARQL-Update-2/manifest.ttl |  30 -
 .../ARQ/Syntax/Syntax-SPARQL-Update/manifest.ttl   | 367 ----------
 .../Syntax-SPARQL-Update/syntax-update-01.ru       |   3 -
 .../Syntax-SPARQL-Update/syntax-update-02.ru       |   7 -
 .../Syntax-SPARQL-Update/syntax-update-03.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-04.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-05.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-06.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-07.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-08.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-09.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-10.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-11.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-12.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-13.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-14.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-15.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-16.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-17.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-18.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-19.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-20.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-21.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-22.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-23.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-24.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-25.ru       |   6 -
 .../Syntax-SPARQL-Update/syntax-update-26.ru       |   3 -
 .../Syntax-SPARQL-Update/syntax-update-27.ru       |   2 -
 .../Syntax-SPARQL-Update/syntax-update-28.ru       |   2 -
 .../Syntax-SPARQL-Update/syntax-update-29.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-30.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-31.ru       |   6 -
 .../Syntax-SPARQL-Update/syntax-update-32.ru       |  16 -
 .../Syntax-SPARQL-Update/syntax-update-33.ru       |   7 -
 .../Syntax-SPARQL-Update/syntax-update-34.ru       |   7 -
 .../Syntax-SPARQL-Update/syntax-update-35.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-36.ru       |   6 -
 .../Syntax-SPARQL-Update/syntax-update-37.ru       |   2 -
 .../Syntax-SPARQL-Update/syntax-update-38.ru       |   1 -
 .../Syntax-SPARQL-Update/syntax-update-39.ru       |   2 -
 .../Syntax-SPARQL-Update/syntax-update-40.ru       |   2 -
 .../Syntax-SPARQL-Update/syntax-update-bad-01.ru   |   2 -
 .../Syntax-SPARQL-Update/syntax-update-bad-02.ru   |   2 -
 .../Syntax-SPARQL-Update/syntax-update-bad-03.ru   |   2 -
 .../Syntax-SPARQL-Update/syntax-update-bad-04.ru   |   2 -
 .../Syntax-SPARQL-Update/syntax-update-bad-05.ru   |   7 -
 .../Syntax-SPARQL-Update/syntax-update-bad-06.ru   |   2 -
 .../Syntax-SPARQL-Update/syntax-update-bad-07.ru   |   3 -
 .../Syntax-SPARQL-Update/syntax-update-bad-08.ru   |   4 -
 .../Syntax-SPARQL-Update/syntax-update-bad-09.ru   |   4 -
 .../Syntax-SPARQL-Update/syntax-update-bad-10.ru   |   2 -
 .../Syntax-SPARQL-Update/syntax-update-bad-11.ru   |   2 -
 .../Syntax-SPARQL-Update/syntax-update-bad-12.ru   |   2 -
 .../Syntax-SPARQL-Update/syntax-update-bad-13.ru   |   7 -
 .../Syntax-SPARQL-Update/syntax-update-bad-14.ru   |   1 -
 .../Syntax-SPARQL-Update/syntax-update-bad-15.ru   |   1 -
 .../Syntax-SPARQL-Update/syntax-update-bad-16.ru   |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/manifest.ttl     | 517 --------------
 .../Syntax/Syntax-SPARQL_10_1/syntax-basic-01.rq   |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-basic-02.rq   |   1 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-basic-03.rq   |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-basic-04.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-basic-05.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-basic-06.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-bnodes-01.rq  |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-bnodes-02.rq  |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-bnodes-03.rq  |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-bnodes-04.rq  |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-bnodes-05.rq  |   5 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-expr-01.rq    |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-expr-02.rq    |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-expr-03.rq    |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-expr-04.rq    |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-expr-05.rq    |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-forms-01.rq   |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-forms-02.rq   |   2 -
 .../Syntax-SPARQL_10_1/syntax-limit-offset-01.rq   |   5 -
 .../Syntax-SPARQL_10_1/syntax-limit-offset-02.rq   |   7 -
 .../Syntax-SPARQL_10_1/syntax-limit-offset-03.rq   |   7 -
 .../Syntax-SPARQL_10_1/syntax-limit-offset-04.rq   |   5 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-lists-01.rq   |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-lists-02.rq   |   2 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-lists-03.rq   |   1 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-lists-04.rq   |   1 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-lists-05.rq   |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-01.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-02.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-03.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-04.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-05.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-06.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-07.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-08.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-09.rq |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-10.rq |   5 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-11.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-12.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-13.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-14.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-15.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-16.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-17.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-18.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-19.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-lit-20.rq |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-order-01.rq   |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-order-02.rq   |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-order-03.rq   |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-order-04.rq   |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-order-05.rq   |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-order-06.rq   |   5 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-order-07.rq   |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-pat-01.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-pat-02.rq |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-pat-03.rq |   7 -
 .../ARQ/Syntax/Syntax-SPARQL_10_1/syntax-pat-04.rq |   8 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-qname-01.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-qname-02.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-qname-03.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-qname-04.rq   |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-qname-05.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-qname-06.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-qname-07.rq   |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-qname-08.rq   |   5 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-01.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-02.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-03.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-05.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-06.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-07.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-08.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-09.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-10.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-11.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-12.rq  |   4 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-13.rq  |   6 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-struct-14.rq  |   6 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-union-01.rq   |   5 -
 .../Syntax/Syntax-SPARQL_10_1/syntax-union-02.rq   |   5 -
 .../ARQ/Syntax/Syntax-SPARQL_10_2/manifest.ttl     | 361 ----------
 .../Syntax/Syntax-SPARQL_10_2/syntax-bnode-01.rq   |   2 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-bnode-02.rq   |   4 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-bnode-03.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-dataset-01.rq |   4 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-dataset-02.rq |   4 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-dataset-03.rq |   5 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-dataset-04.rq |   7 -
 .../ARQ/Syntax/Syntax-SPARQL_10_2/syntax-esc-01.rq |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_2/syntax-esc-02.rq |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_2/syntax-esc-03.rq |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_2/syntax-esc-04.rq |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_2/syntax-esc-05.rq |   5 -
 .../Syntax-SPARQL_10_2/syntax-form-ask-02.rq       |   1 -
 .../Syntax-SPARQL_10_2/syntax-form-construct01.rq  |   1 -
 .../Syntax-SPARQL_10_2/syntax-form-construct02.rq  |   1 -
 .../Syntax-SPARQL_10_2/syntax-form-construct03.rq  |   1 -
 .../Syntax-SPARQL_10_2/syntax-form-construct04.rq  |   1 -
 .../Syntax-SPARQL_10_2/syntax-form-construct05.rq  |   5 -
 .../Syntax-SPARQL_10_2/syntax-form-construct06.rq  |   5 -
 .../Syntax-SPARQL_10_2/syntax-form-construct07.rq  |   1 -
 .../Syntax-SPARQL_10_2/syntax-form-describe01.rq   |   1 -
 .../Syntax-SPARQL_10_2/syntax-form-describe02.rq   |   1 -
 .../Syntax-SPARQL_10_2/syntax-form-select-01.rq    |   1 -
 .../Syntax-SPARQL_10_2/syntax-form-select-02.rq    |   1 -
 .../Syntax-SPARQL_10_2/syntax-function-01.rq       |   2 -
 .../Syntax-SPARQL_10_2/syntax-function-02.rq       |   2 -
 .../Syntax-SPARQL_10_2/syntax-function-03.rq       |   3 -
 .../Syntax-SPARQL_10_2/syntax-function-04.rq       |   4 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-01.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-02.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-03.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-04.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-05.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-06.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-07.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-08.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-09.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-10.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-11.rq |   1 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-12.rq |   2 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-13.rq |   3 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-general-14.rq |   3 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-graph-01.rq   |   6 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-graph-02.rq   |   6 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-graph-03.rq   |   6 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-graph-04.rq   |   7 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-graph-05.rq   |   7 -
 .../Syntax-SPARQL_10_2/syntax-keywords-01.rq       |   4 -
 .../Syntax-SPARQL_10_2/syntax-keywords-02.rq       |   4 -
 .../Syntax-SPARQL_10_2/syntax-keywords-03.rq       |   4 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-lists-01.rq   |   2 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-lists-02.rq   |   2 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-lists-03.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-lists-04.rq   |   3 -
 .../Syntax/Syntax-SPARQL_10_2/syntax-lists-05.rq   |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/bnode-dot.rq     |   2 -
 .../bnodes-missing-pvalues-01.rq                   |   3 -
 .../bnodes-missing-pvalues-02.rq                   |   2 -
 .../Syntax/Syntax-SPARQL_10_3/empty-optional-01.rq |   2 -
 .../Syntax/Syntax-SPARQL_10_3/empty-optional-02.rq |   2 -
 .../Syntax-SPARQL_10_3/filter-missing-parens.rq    |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/lone-list.rq     |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/lone-node.rq     |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/manifest.ttl     | 379 -----------
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-01.rq        |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-02.rq        |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-03.rq        |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-04.rq        |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-05.rq        |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-06.rq        |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-07.rq        |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-08.rq        |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-09.rq        |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-10.rq        |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-11.rq        |   7 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-01.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-02.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-03.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-04.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-05.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-06.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-07.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-08.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-09.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-10.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-11.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-12.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-13.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-14.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-15.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-16.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-17.rq    |   3 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-18.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-19.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-20.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-21.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-22.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-23.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-24.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-25.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-26.rq    |   4 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-27.rq    |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-28.rq    |   5 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-29.rq    |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-30.rq    |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-31.rq    |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-32.rq    |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-33.rq    |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-34.rq    |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-35.rq    |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-36.rq    |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-37.rq    |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-38.rq    |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_10_3/syn-bad-39.rq    |   6 -
 .../ARQ/Syntax/Syntax-SPARQL_11/manifest.ttl       | 337 ----------
 .../ARQ/Syntax/Syntax-SPARQL_11/syn-bad-01.rq      |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syn-bad-02.rq      |   2 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syn-bad-03.rq      |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syn-bad-04.rq      |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syn-bad-05.rq      |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syn-bad-06.rq      |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syn-bad-07.rq      |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syn-bad-08.rq      |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-01.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-02.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-03.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-04.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-05.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-06.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-07.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-08.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-09.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-10.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-11.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-12.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-13.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-14.rq |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-aggregate-15.rq |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syntax-bind-02.rq  |   1 -
 .../Syntax-SPARQL_11/syntax-construct-where-01.rq  |   1 -
 .../Syntax-SPARQL_11/syntax-construct-where-02.rq  |   3 -
 .../Syntax/Syntax-SPARQL_11/syntax-exists-01.rq    |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-exists-02.rq    |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-exists-03.rq    |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syntax-minus-01.rq |   1 -
 .../Syntax-SPARQL_11/syntax-not-exists-01.rq       |   1 -
 .../Syntax-SPARQL_11/syntax-not-exists-02.rq       |   1 -
 .../Syntax-SPARQL_11/syntax-not-exists-03.rq       |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syntax-oneof-01.rq |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syntax-oneof-02.rq |   1 -
 .../ARQ/Syntax/Syntax-SPARQL_11/syntax-oneof-03.rq |   1 -
 .../Syntax-SPARQL_11/syntax-select-expr-01.rq      |   1 -
 .../Syntax-SPARQL_11/syntax-select-expr-02.rq      |   1 -
 .../Syntax-SPARQL_11/syntax-select-expr-03.rq      |   1 -
 .../Syntax-SPARQL_11/syntax-select-expr-04.rq      |   2 -
 .../Syntax-SPARQL_11/syntax-select-expr-05.rq      |   2 -
 .../Syntax/Syntax-SPARQL_11/syntax-subquery-01.rq  |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-subquery-02.rq  |   4 -
 .../Syntax/Syntax-SPARQL_11/syntax-subquery-03.rq  |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-values-01.rq    |   1 -
 .../Syntax/Syntax-SPARQL_11/syntax-values-09.rq    |   1 -
 .../Syntax-SPARQL_11/syntax-values-bad-01.rq       |   1 -
 .../Syntax-SPARQL_11/syntax-values-bad-02.rq       |   1 -
 .../Syntax-SPARQL_11/syntax-values-bad-03.rq       |   1 -
 .../Syntax-SPARQL_11/syntax-values-bad-04.rq       |   1 -
 jena-arq/testing/ARQ/Syntax/exportToDAWG           |  13 -
 jena-arq/testing/ARQ/Syntax/manifest-syntax.ttl    |  36 -
 jena-arq/testing/ARQ/Syntax/syn-arq.sh             | 417 ------------
 jena-arq/testing/ARQ/Syntax/syn-func.sh            | 215 ------
 jena-arq/testing/ARQ/Syntax/syn-lateral.sh         |  80 ---
 jena-arq/testing/ARQ/Syntax/syn-reification.sh     |  74 --
 jena-arq/testing/ARQ/Syntax/syn-sparql-fed.sh      |  14 -
 jena-arq/testing/ARQ/Syntax/syn-sparql_10_1.sh     | 616 -----------------
 jena-arq/testing/ARQ/Syntax/syn-sparql_10_2.sh     | 391 -----------
 jena-arq/testing/ARQ/Syntax/syn-sparql_10_3.sh     | 405 -----------
 jena-arq/testing/ARQ/Syntax/syn-sparql_11_1.sh     | 251 -------
 jena-arq/testing/ARQ/Syntax/syn-up.sh              |  17 -
 jena-arq/testing/ARQ/Syntax/syn-update.sh          | 344 ----------
 jena-arq/testing/ARQ/Syntax/syn.sh                 |  78 ---
 jena-arq/testing/ARQ/TypePromotion/false.ttl       |   9 -
 jena-arq/testing/ARQ/TypePromotion/manifest.ttl    | 329 ---------
 .../ARQ/TypePromotion/tP-byte-short-fail.rq        |  10 -
 .../testing/ARQ/TypePromotion/tP-byte-short.rq     |  10 -
 .../ARQ/TypePromotion/tP-decimal-decimal.rq        |  10 -
 .../ARQ/TypePromotion/tP-double-decimal-fail.rq    |  10 -
 .../testing/ARQ/TypePromotion/tP-double-decimal.rq |  10 -
 .../testing/ARQ/TypePromotion/tP-double-double.rq  |  10 -
 .../ARQ/TypePromotion/tP-double-float-fail.rq      |  10 -
 .../testing/ARQ/TypePromotion/tP-double-float.rq   |  10 -
 .../ARQ/TypePromotion/tP-float-decimal-fail.rq     |  10 -
 .../testing/ARQ/TypePromotion/tP-float-decimal.rq  |  10 -
 .../testing/ARQ/TypePromotion/tP-float-float.rq    |  10 -
 jena-arq/testing/ARQ/TypePromotion/tP-int-short.rq |  10 -
 .../testing/ARQ/TypePromotion/tP-integer-short.rq  |  10 -
 .../testing/ARQ/TypePromotion/tP-long-short.rq     |  10 -
 .../ARQ/TypePromotion/tP-negativeInteger-short.rq  |  10 -
 .../TypePromotion/tP-nonNegativeInteger-short.rq   |  10 -
 .../TypePromotion/tP-nonPositiveInteger-short.rq   |  10 -
 .../ARQ/TypePromotion/tP-positiveInteger-short.rq  |  10 -
 .../ARQ/TypePromotion/tP-short-byte-fail.rq        |  10 -
 .../testing/ARQ/TypePromotion/tP-short-decimal.rq  |  10 -
 .../testing/ARQ/TypePromotion/tP-short-double.rq   |  10 -
 .../testing/ARQ/TypePromotion/tP-short-float.rq    |  10 -
 .../testing/ARQ/TypePromotion/tP-short-int-fail.rq |  10 -
 .../ARQ/TypePromotion/tP-short-long-fail.rq        |  10 -
 .../ARQ/TypePromotion/tP-short-short-fail.rq       |  10 -
 .../testing/ARQ/TypePromotion/tP-short-short.rq    |  10 -
 .../ARQ/TypePromotion/tP-unsignedByte-short.rq     |  10 -
 .../ARQ/TypePromotion/tP-unsignedInt-short.rq      |  10 -
 .../ARQ/TypePromotion/tP-unsignedLong-short.rq     |  10 -
 .../ARQ/TypePromotion/tP-unsignedShort-short.rq    |  10 -
 jena-arq/testing/ARQ/TypePromotion/tP.ttl          |  28 -
 jena-arq/testing/ARQ/TypePromotion/true.ttl        |   9 -
 jena-arq/testing/ARQ/Union/data-1.ttl              |  10 -
 jena-arq/testing/ARQ/Union/data.ttl                |  11 -
 jena-arq/testing/ARQ/Union/manifest.ttl            |  82 ---
 jena-arq/testing/ARQ/Union/union-1.rq              |   8 -
 jena-arq/testing/ARQ/Union/union-1.srx             |  21 -
 jena-arq/testing/ARQ/Union/union-2.rq              |   8 -
 jena-arq/testing/ARQ/Union/union-2.srx             |  18 -
 jena-arq/testing/ARQ/Union/union-3.rq              |   8 -
 jena-arq/testing/ARQ/Union/union-3.srx             |  18 -
 jena-arq/testing/ARQ/Union/union-4.rq              |   8 -
 jena-arq/testing/ARQ/Union/union-4.srx             |  70 --
 jena-arq/testing/ARQ/Union/union-5.rq              |   8 -
 jena-arq/testing/ARQ/Union/union-5.srx             |  14 -
 jena-arq/testing/ARQ/Union/union-6.rq              |  12 -
 jena-arq/testing/ARQ/Union/union-6.srx             |  15 -
 jena-arq/testing/ARQ/Union/union-7.rq              |  12 -
 jena-arq/testing/ARQ/Union/union-7.srx             |  70 --
 jena-arq/testing/ARQ/Union/union-8.rq              |   8 -
 jena-arq/testing/ARQ/Union/union-8.srx             |  25 -
 jena-arq/testing/ARQ/Union/union-9.rq              |   8 -
 jena-arq/testing/ARQ/Union/union-9.srx             |  44 --
 jena-arq/testing/ARQ/blank_manifest.ttl            |  34 -
 jena-arq/testing/ARQ/makeResults                   |  19 -
 jena-arq/testing/ARQ/manifest-arq.ttl              |  72 +-
 jena-arq/testing/ARQ/manifest-ref-arq.ttl          |  66 +-
 jena-arq/testing/ARQ/testing-2026-05.zip           | Bin 0 -> 4054351 bytes
 jena-arq/testing/DAWG-Final/LICENSE                |  21 -
 jena-arq/testing/DAWG-Final/README                 |  16 -
 jena-arq/testing/DAWG-Final/SPARQL11_RDF11.txt     |  18 -
 jena-arq/testing/DAWG-Final/algebra/LICENSE        |  49 --
 jena-arq/testing/DAWG-Final/algebra/data-1.ttl     |   5 -
 jena-arq/testing/DAWG-Final/algebra/data-2.ttl     |  11 -
 .../testing/DAWG-Final/algebra/filter-nested-1.rq  |   4 -
 .../testing/DAWG-Final/algebra/filter-nested-1.srx |  16 -
 .../testing/DAWG-Final/algebra/filter-nested-2.rq  |   4 -
 .../testing/DAWG-Final/algebra/filter-nested-2.srx |  11 -
 .../DAWG-Final/algebra/filter-placement-1.rq       |   7 -
 .../DAWG-Final/algebra/filter-placement-1.srx      |  16 -
 .../DAWG-Final/algebra/filter-placement-2.rq       |   7 -
 .../DAWG-Final/algebra/filter-placement-2.srx      |  16 -
 .../DAWG-Final/algebra/filter-placement-3.rq       |   9 -
 .../DAWG-Final/algebra/filter-placement-3.srx      |  20 -
 .../testing/DAWG-Final/algebra/filter-scope-1.rq   |   9 -
 .../testing/DAWG-Final/algebra/filter-scope-1.srx  | 109 ---
 .../testing/DAWG-Final/algebra/join-combo-1.rq     |   7 -
 .../testing/DAWG-Final/algebra/join-combo-1.srx    |  36 -
 .../testing/DAWG-Final/algebra/join-combo-2.rq     |   6 -
 .../testing/DAWG-Final/algebra/join-combo-2.srx    |  21 -
 .../DAWG-Final/algebra/join-combo-graph-1.ttl      |   5 -
 .../DAWG-Final/algebra/join-combo-graph-2.ttl      |  15 -
 jena-arq/testing/DAWG-Final/algebra/manifest.ttl   | 190 ------
 .../testing/DAWG-Final/algebra/opt-filter-1.rq     |  11 -
 .../testing/DAWG-Final/algebra/opt-filter-1.srx    |  50 --
 .../testing/DAWG-Final/algebra/opt-filter-1.ttl    |   9 -
 .../testing/DAWG-Final/algebra/opt-filter-2.rq     |  12 -
 .../testing/DAWG-Final/algebra/opt-filter-2.srx    |  36 -
 .../testing/DAWG-Final/algebra/opt-filter-2.ttl    |   9 -
 .../testing/DAWG-Final/algebra/opt-filter-3.rq     |  10 -
 .../testing/DAWG-Final/algebra/opt-filter-3.srx    |  13 -
 .../testing/DAWG-Final/algebra/opt-filter-3.ttl    |   9 -
 .../DAWG-Final/algebra/two-nested-opt-alt.rq       |  10 -
 .../DAWG-Final/algebra/two-nested-opt-alt.srx      |  28 -
 .../testing/DAWG-Final/algebra/two-nested-opt.rq   |  11 -
 .../testing/DAWG-Final/algebra/two-nested-opt.srx  |  17 -
 .../testing/DAWG-Final/algebra/two-nested-opt.ttl  |   7 -
 .../testing/DAWG-Final/algebra/var-scope-join-1.rq |   8 -
 .../DAWG-Final/algebra/var-scope-join-1.srx        |  13 -
 .../DAWG-Final/algebra/var-scope-join-1.ttl        |  15 -
 jena-arq/testing/DAWG-Final/ask/LICENSE            |  49 --
 jena-arq/testing/DAWG-Final/ask/ask-1.rq           |   3 -
 jena-arq/testing/DAWG-Final/ask/ask-1.srx          |   6 -
 jena-arq/testing/DAWG-Final/ask/ask-4.rq           |   3 -
 jena-arq/testing/DAWG-Final/ask/ask-4.srx          |   6 -
 jena-arq/testing/DAWG-Final/ask/ask-7.rq           |   3 -
 jena-arq/testing/DAWG-Final/ask/ask-7.srx          |   6 -
 jena-arq/testing/DAWG-Final/ask/ask-8.rq           |   3 -
 jena-arq/testing/DAWG-Final/ask/ask-8.srx          |   6 -
 jena-arq/testing/DAWG-Final/ask/data.ttl           |   9 -
 jena-arq/testing/DAWG-Final/ask/manifest.ttl       |  76 ---
 jena-arq/testing/DAWG-Final/basic/LICENSE          |  49 --
 jena-arq/testing/DAWG-Final/basic/base-prefix-1.rq |   4 -
 .../testing/DAWG-Final/basic/base-prefix-1.srx     |  28 -
 jena-arq/testing/DAWG-Final/basic/base-prefix-2.rq |   4 -
 .../testing/DAWG-Final/basic/base-prefix-2.srx     |  20 -
 jena-arq/testing/DAWG-Final/basic/base-prefix-3.rq |   4 -
 .../testing/DAWG-Final/basic/base-prefix-3.srx     |  16 -
 jena-arq/testing/DAWG-Final/basic/base-prefix-4.rq |   3 -
 .../testing/DAWG-Final/basic/base-prefix-4.srx     |  16 -
 jena-arq/testing/DAWG-Final/basic/base-prefix-5.rq |   3 -
 .../testing/DAWG-Final/basic/base-prefix-5.srx     |  16 -
 jena-arq/testing/DAWG-Final/basic/bgp-no-match.rq  |   8 -
 jena-arq/testing/DAWG-Final/basic/bgp-no-match.srx |  10 -
 jena-arq/testing/DAWG-Final/basic/data-1.ttl       |   8 -
 jena-arq/testing/DAWG-Final/basic/data-2.ttl       |   8 -
 jena-arq/testing/DAWG-Final/basic/data-3.ttl       |  12 -
 jena-arq/testing/DAWG-Final/basic/data-4.ttl       |  14 -
 jena-arq/testing/DAWG-Final/basic/data-5.ttl       |   5 -
 jena-arq/testing/DAWG-Final/basic/data-6.ttl       |   5 -
 jena-arq/testing/DAWG-Final/basic/data-7.ttl       |   7 -
 jena-arq/testing/DAWG-Final/basic/list-1.rq        |   5 -
 jena-arq/testing/DAWG-Final/basic/list-1.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/list-2.rq        |   5 -
 jena-arq/testing/DAWG-Final/basic/list-2.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/list-3.rq        |   5 -
 jena-arq/testing/DAWG-Final/basic/list-3.srx       |  20 -
 jena-arq/testing/DAWG-Final/basic/list-4.rq        |   5 -
 jena-arq/testing/DAWG-Final/basic/list-4.srx       |  24 -
 jena-arq/testing/DAWG-Final/basic/manifest.ttl     | 329 ---------
 jena-arq/testing/DAWG-Final/basic/prefix-name-1.rq |   4 -
 .../testing/DAWG-Final/basic/prefix-name-1.srx     |  16 -
 jena-arq/testing/DAWG-Final/basic/quotes-1.rq      |   6 -
 jena-arq/testing/DAWG-Final/basic/quotes-1.srx     |  16 -
 jena-arq/testing/DAWG-Final/basic/quotes-2.rq      |   6 -
 jena-arq/testing/DAWG-Final/basic/quotes-2.srx     |  16 -
 jena-arq/testing/DAWG-Final/basic/quotes-3.rq      |   8 -
 jena-arq/testing/DAWG-Final/basic/quotes-3.srx     |  16 -
 jena-arq/testing/DAWG-Final/basic/quotes-4.rq      |   9 -
 jena-arq/testing/DAWG-Final/basic/quotes-4.srx     |  16 -
 jena-arq/testing/DAWG-Final/basic/spoo-1.rq        |   7 -
 jena-arq/testing/DAWG-Final/basic/spoo-1.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/term-1.rq        |   4 -
 jena-arq/testing/DAWG-Final/basic/term-1.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/term-2.rq        |   4 -
 jena-arq/testing/DAWG-Final/basic/term-2.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/term-3.rq        |   4 -
 jena-arq/testing/DAWG-Final/basic/term-3.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/term-4.rq        |   4 -
 jena-arq/testing/DAWG-Final/basic/term-4.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/term-5.rq        |   4 -
 jena-arq/testing/DAWG-Final/basic/term-5.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/term-6.rq        |   7 -
 jena-arq/testing/DAWG-Final/basic/term-6.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/term-7.rq        |   5 -
 jena-arq/testing/DAWG-Final/basic/term-7.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/term-8.rq        |   5 -
 jena-arq/testing/DAWG-Final/basic/term-8.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/term-9.rq        |   5 -
 jena-arq/testing/DAWG-Final/basic/term-9.srx       |  16 -
 jena-arq/testing/DAWG-Final/basic/var-1.rq         |   4 -
 jena-arq/testing/DAWG-Final/basic/var-1.srx        |  28 -
 jena-arq/testing/DAWG-Final/basic/var-2.rq         |   4 -
 jena-arq/testing/DAWG-Final/basic/var-2.srx        |  28 -
 .../testing/DAWG-Final/bnode-coreference/LICENSE   |  49 --
 .../testing/DAWG-Final/bnode-coreference/data.ttl  |  29 -
 .../DAWG-Final/bnode-coreference/manifest.ttl      |  37 -
 .../testing/DAWG-Final/bnode-coreference/query.rq  |   7 -
 .../DAWG-Final/bnode-coreference/result.ttl        |  27 -
 .../DAWG-Final/boolean-effective-value/LICENSE     |  49 --
 .../DAWG-Final/boolean-effective-value/data-1.ttl  |  14 -
 .../DAWG-Final/boolean-effective-value/data-2.ttl  |  19 -
 .../boolean-effective-value/manifest.ttl           |  96 ---
 .../boolean-effective-value/query-bev-1.rq         |   7 -
 .../boolean-effective-value/query-bev-2.rq         |   7 -
 .../boolean-effective-value/query-bev-3.rq         |   7 -
 .../boolean-effective-value/query-bev-4.rq         |   7 -
 .../boolean-effective-value/query-bev-5.rq         |   9 -
 .../boolean-effective-value/query-bev-6.rq         |   9 -
 .../query-boolean-literal.rq                       |   5 -
 .../boolean-effective-value/result-bev-1.ttl       |  27 -
 .../boolean-effective-value/result-bev-2.ttl       |  27 -
 .../boolean-effective-value/result-bev-3.ttl       |  27 -
 .../boolean-effective-value/result-bev-4.ttl       |  27 -
 .../boolean-effective-value/result-bev-5.ttl       |  12 -
 .../boolean-effective-value/result-bev-6.ttl       |  16 -
 .../result-boolean-literal.ttl                     |  12 -
 jena-arq/testing/DAWG-Final/bound/LICENSE          |  49 --
 .../testing/DAWG-Final/bound/bound1-result.ttl     |  20 -
 jena-arq/testing/DAWG-Final/bound/bound1.rq        |   8 -
 jena-arq/testing/DAWG-Final/bound/data.ttl         |   5 -
 jena-arq/testing/DAWG-Final/bound/manifest.ttl     |  37 -
 jena-arq/testing/DAWG-Final/cast/LICENSE           |  49 --
 jena-arq/testing/DAWG-Final/cast/cast-bool.rq      |   7 -
 jena-arq/testing/DAWG-Final/cast/cast-bool.srx     |  16 -
 jena-arq/testing/DAWG-Final/cast/cast-dT.rq        |   7 -
 jena-arq/testing/DAWG-Final/cast/cast-dT.srx       |  16 -
 jena-arq/testing/DAWG-Final/cast/cast-dbl.rq       |   7 -
 jena-arq/testing/DAWG-Final/cast/cast-dbl.srx      |  26 -
 jena-arq/testing/DAWG-Final/cast/cast-dec.rq       |   7 -
 jena-arq/testing/DAWG-Final/cast/cast-dec.srx      |  21 -
 jena-arq/testing/DAWG-Final/cast/cast-flt.rq       |   7 -
 jena-arq/testing/DAWG-Final/cast/cast-flt.srx      |  26 -
 jena-arq/testing/DAWG-Final/cast/cast-int.rq       |   7 -
 jena-arq/testing/DAWG-Final/cast/cast-int.srx      |  16 -
 jena-arq/testing/DAWG-Final/cast/cast-str.rq       |   7 -
 jena-arq/testing/DAWG-Final/cast/cast-str.srx      |  46 --
 jena-arq/testing/DAWG-Final/cast/data.ttl          |   9 -
 jena-arq/testing/DAWG-Final/cast/manifest.ttl      |  98 ---
 jena-arq/testing/DAWG-Final/construct/LICENSE      |  49 --
 .../testing/DAWG-Final/construct/data-ident.ttl    |  18 -
 jena-arq/testing/DAWG-Final/construct/data-opt.ttl |  12 -
 .../testing/DAWG-Final/construct/data-reif.ttl     |  17 -
 jena-arq/testing/DAWG-Final/construct/manifest.ttl |  92 ---
 .../construct/query-construct-optional.rq          |  10 -
 .../testing/DAWG-Final/construct/query-ident.rq    |   7 -
 .../testing/DAWG-Final/construct/query-reif-1.rq   |   9 -
 .../testing/DAWG-Final/construct/query-reif-2.rq   |   9 -
 .../testing/DAWG-Final/construct/query-subgraph.rq |   7 -
 .../construct/result-construct-optional.ttl        |   4 -
 .../testing/DAWG-Final/construct/result-ident.ttl  |  17 -
 .../testing/DAWG-Final/construct/result-reif.ttl   |  34 -
 .../DAWG-Final/construct/result-subgraph.ttl       |   6 -
 jena-arq/testing/DAWG-Final/dataset/LICENSE        |  49 --
 .../testing/DAWG-Final/dataset/data-g1-dup.ttl     |   5 -
 jena-arq/testing/DAWG-Final/dataset/data-g1.ttl    |   5 -
 .../testing/DAWG-Final/dataset/data-g2-dup.ttl     |   4 -
 jena-arq/testing/DAWG-Final/dataset/data-g2.ttl    |   4 -
 .../testing/DAWG-Final/dataset/data-g3-dup.ttl     |   5 -
 jena-arq/testing/DAWG-Final/dataset/data-g3.ttl    |   5 -
 .../testing/DAWG-Final/dataset/data-g4-dup.ttl     |   4 -
 jena-arq/testing/DAWG-Final/dataset/data-g4.ttl    |   4 -
 jena-arq/testing/DAWG-Final/dataset/dataset-01.rq  |   5 -
 jena-arq/testing/DAWG-Final/dataset/dataset-01.ttl |  29 -
 jena-arq/testing/DAWG-Final/dataset/dataset-02.rq  |   5 -
 jena-arq/testing/DAWG-Final/dataset/dataset-02.ttl |   8 -
 jena-arq/testing/DAWG-Final/dataset/dataset-03.rq  |   8 -
 jena-arq/testing/DAWG-Final/dataset/dataset-03.ttl |  36 -
 jena-arq/testing/DAWG-Final/dataset/dataset-04.rq  |   8 -
 jena-arq/testing/DAWG-Final/dataset/dataset-04.ttl |   9 -
 jena-arq/testing/DAWG-Final/dataset/dataset-05.rq  |   6 -
 jena-arq/testing/DAWG-Final/dataset/dataset-05.ttl |  29 -
 jena-arq/testing/DAWG-Final/dataset/dataset-06.rq  |   9 -
 jena-arq/testing/DAWG-Final/dataset/dataset-06.ttl |  23 -
 jena-arq/testing/DAWG-Final/dataset/dataset-07.rq  |  10 -
 jena-arq/testing/DAWG-Final/dataset/dataset-07.ttl |  43 --
 jena-arq/testing/DAWG-Final/dataset/dataset-08.rq  |   9 -
 jena-arq/testing/DAWG-Final/dataset/dataset-08.ttl |  31 -
 jena-arq/testing/DAWG-Final/dataset/dataset-09.rq  |   8 -
 jena-arq/testing/DAWG-Final/dataset/dataset-09.ttl |  11 -
 jena-arq/testing/DAWG-Final/dataset/dataset-09b.rq |   8 -
 jena-arq/testing/DAWG-Final/dataset/dataset-10.rq  |   9 -
 jena-arq/testing/DAWG-Final/dataset/dataset-10.ttl |  11 -
 jena-arq/testing/DAWG-Final/dataset/dataset-10b.rq |   9 -
 jena-arq/testing/DAWG-Final/dataset/dataset-11.rq  |  13 -
 jena-arq/testing/DAWG-Final/dataset/dataset-11.ttl | 108 ---
 jena-arq/testing/DAWG-Final/dataset/dataset-12.rq  |  16 -
 jena-arq/testing/DAWG-Final/dataset/dataset-12.ttl | 148 ----
 jena-arq/testing/DAWG-Final/dataset/dataset-12b.rq |  16 -
 jena-arq/testing/DAWG-Final/dataset/manifest.ttl   | 192 ------
 jena-arq/testing/DAWG-Final/distinct/LICENSE       |  49 --
 jena-arq/testing/DAWG-Final/distinct/data-all.ttl  |  74 --
 jena-arq/testing/DAWG-Final/distinct/data-node.ttl |   9 -
 jena-arq/testing/DAWG-Final/distinct/data-num.ttl  |  35 -
 jena-arq/testing/DAWG-Final/distinct/data-opt.ttl  |  13 -
 jena-arq/testing/DAWG-Final/distinct/data-star.ttl |   8 -
 jena-arq/testing/DAWG-Final/distinct/data-str.ttl  |  29 -
 .../DAWG-Final/distinct/distinct-1-results.srx     |  61 --
 jena-arq/testing/DAWG-Final/distinct/distinct-1.rq |   7 -
 jena-arq/testing/DAWG-Final/distinct/distinct-2.rq |   8 -
 .../testing/DAWG-Final/distinct/distinct-all.srx   |  93 ---
 .../DAWG-Final/distinct/distinct-all_RDF_10.srx    | 111 ---
 .../DAWG-Final/distinct/distinct-all_RDF_11.srx    |  93 ---
 .../testing/DAWG-Final/distinct/distinct-node.srx  |  21 -
 .../testing/DAWG-Final/distinct/distinct-num.srx   |  56 --
 .../testing/DAWG-Final/distinct/distinct-opt.srx   |  23 -
 .../testing/DAWG-Final/distinct/distinct-star-1.rq |   7 -
 .../DAWG-Final/distinct/distinct-star-1.srx        |  20 -
 .../testing/DAWG-Final/distinct/distinct-str.srx   |  38 --
 .../DAWG-Final/distinct/distinct-str_RDF_10.srx    |  56 --
 .../DAWG-Final/distinct/distinct-str_RDF_11.srx    |  38 --
 jena-arq/testing/DAWG-Final/distinct/manifest.ttl  | 143 ----
 .../testing/DAWG-Final/distinct/no-distinct-1.rq   |   4 -
 .../testing/DAWG-Final/distinct/no-distinct-2.rq   |   8 -
 .../DAWG-Final/distinct/no-distinct-all.srx        | 231 -------
 .../DAWG-Final/distinct/no-distinct-node.srx       |  31 -
 .../DAWG-Final/distinct/no-distinct-num.srx        | 121 ----
 .../DAWG-Final/distinct/no-distinct-opt.srx        |  35 -
 .../DAWG-Final/distinct/no-distinct-str.srx        | 101 ---
 jena-arq/testing/DAWG-Final/expr-builtin/LICENSE   |  49 --
 .../DAWG-Final/expr-builtin/data-builtin-1.ttl     |  20 -
 .../DAWG-Final/expr-builtin/data-builtin-2.ttl     |  14 -
 .../expr-builtin/data-langMatches-de.ttl           |   8 -
 .../DAWG-Final/expr-builtin/data-langMatches.ttl   |   7 -
 .../expr-builtin/lang-case-insensitive-eq.srx      |  98 ---
 .../expr-builtin/lang-case-insensitive-ne.srx      |  17 -
 .../expr-builtin/lang-case-sensitivity-eq.rq       |  11 -
 .../expr-builtin/lang-case-sensitivity-ne.rq       |  12 -
 .../expr-builtin/lang-case-sensitivity.ttl         |   7 -
 .../testing/DAWG-Final/expr-builtin/manifest.ttl   | 291 --------
 .../testing/DAWG-Final/expr-builtin/q-blank-1.rq   |   7 -
 .../DAWG-Final/expr-builtin/q-datatype-1.rq        |   7 -
 .../DAWG-Final/expr-builtin/q-datatype-2.rq        |   9 -
 .../DAWG-Final/expr-builtin/q-datatype-3.rq        |   9 -
 .../testing/DAWG-Final/expr-builtin/q-iri-1.rq     |   7 -
 .../DAWG-Final/expr-builtin/q-isliteral-1.rq       |   7 -
 .../testing/DAWG-Final/expr-builtin/q-lang-1.rq    |   9 -
 .../testing/DAWG-Final/expr-builtin/q-lang-2.rq    |   7 -
 .../testing/DAWG-Final/expr-builtin/q-lang-3.rq    |   6 -
 .../DAWG-Final/expr-builtin/q-langMatches-1.rq     |   4 -
 .../DAWG-Final/expr-builtin/q-langMatches-2.rq     |   4 -
 .../DAWG-Final/expr-builtin/q-langMatches-3.rq     |   4 -
 .../DAWG-Final/expr-builtin/q-langMatches-4.rq     |   4 -
 .../DAWG-Final/expr-builtin/q-langMatches-de-de.rq |   7 -
 .../testing/DAWG-Final/expr-builtin/q-str-1.rq     |   7 -
 .../testing/DAWG-Final/expr-builtin/q-str-2.rq     |   7 -
 .../testing/DAWG-Final/expr-builtin/q-str-3.rq     |   7 -
 .../testing/DAWG-Final/expr-builtin/q-str-4.rq     |   7 -
 .../testing/DAWG-Final/expr-builtin/q-uri-1.rq     |   7 -
 .../DAWG-Final/expr-builtin/result-blank-1.ttl     |  16 -
 .../DAWG-Final/expr-builtin/result-datatype-1.ttl  |  32 -
 .../DAWG-Final/expr-builtin/result-datatype-2.srx  |  31 -
 .../DAWG-Final/expr-builtin/result-datatype-3.srx  |  21 -
 .../DAWG-Final/expr-builtin/result-iri-1.ttl       |  16 -
 .../DAWG-Final/expr-builtin/result-isliteral-1.ttl |  28 -
 .../DAWG-Final/expr-builtin/result-lang-1.srx      |  36 -
 .../DAWG-Final/expr-builtin/result-lang-2.srx      |  31 -
 .../DAWG-Final/expr-builtin/result-lang-3.srx      |  16 -
 .../expr-builtin/result-langMatches-1.ttl          |  14 -
 .../expr-builtin/result-langMatches-2.ttl          |  21 -
 .../expr-builtin/result-langMatches-3.ttl          |  28 -
 .../expr-builtin/result-langMatches-4.ttl          |  14 -
 .../expr-builtin/result-langMatches-de.ttl         |  16 -
 .../DAWG-Final/expr-builtin/result-sameTerm-eq.ttl | 188 ------
 .../expr-builtin/result-sameTerm-not-eq.ttl        | 370 ----------
 .../DAWG-Final/expr-builtin/result-sameTerm.ttl    | 188 ------
 .../DAWG-Final/expr-builtin/result-str-1.ttl       |  40 --
 .../DAWG-Final/expr-builtin/result-str-2.ttl       |  16 -
 .../DAWG-Final/expr-builtin/result-str-3.ttl       |  24 -
 .../DAWG-Final/expr-builtin/result-str-4.ttl       |  15 -
 .../DAWG-Final/expr-builtin/result-uri-1.ttl       |  16 -
 .../testing/DAWG-Final/expr-builtin/sameTerm-eq.rq |  11 -
 .../DAWG-Final/expr-builtin/sameTerm-not-eq.rq     |  11 -
 .../testing/DAWG-Final/expr-builtin/sameTerm.rq    |  11 -
 jena-arq/testing/DAWG-Final/expr-equals/LICENSE    |  49 --
 .../testing/DAWG-Final/expr-equals/data-eq.ttl     |  23 -
 .../testing/DAWG-Final/expr-equals/manifest.ttl    | 158 -----
 .../testing/DAWG-Final/expr-equals/query-eq-1.rq   |   7 -
 .../testing/DAWG-Final/expr-equals/query-eq-2.rq   |   7 -
 .../testing/DAWG-Final/expr-equals/query-eq-3.rq   |   7 -
 .../testing/DAWG-Final/expr-equals/query-eq-4.rq   |   7 -
 .../testing/DAWG-Final/expr-equals/query-eq-5.rq   |   7 -
 .../DAWG-Final/expr-equals/query-eq-graph-1.rq     |   6 -
 .../DAWG-Final/expr-equals/query-eq-graph-2.rq     |   6 -
 .../DAWG-Final/expr-equals/query-eq-graph-3.rq     |   6 -
 .../DAWG-Final/expr-equals/query-eq-graph-4.rq     |   6 -
 .../DAWG-Final/expr-equals/query-eq-graph-5.rq     |   7 -
 .../testing/DAWG-Final/expr-equals/query-eq2-1.rq  |   8 -
 .../testing/DAWG-Final/expr-equals/query-eq2-2.rq  |   8 -
 .../DAWG-Final/expr-equals/query-eq2-graph-1.rq    |   7 -
 .../testing/DAWG-Final/expr-equals/result-eq-1.ttl |  37 -
 .../testing/DAWG-Final/expr-equals/result-eq-2.ttl |  37 -
 .../testing/DAWG-Final/expr-equals/result-eq-3.ttl |  12 -
 .../testing/DAWG-Final/expr-equals/result-eq-4.ttl |  12 -
 .../testing/DAWG-Final/expr-equals/result-eq-5.ttl |  12 -
 .../DAWG-Final/expr-equals/result-eq-graph-1.ttl   |  20 -
 .../DAWG-Final/expr-equals/result-eq-graph-2.ttl   |  22 -
 .../DAWG-Final/expr-equals/result-eq-graph-3.ttl   |  11 -
 .../DAWG-Final/expr-equals/result-eq-graph-4.ttl   |  11 -
 .../DAWG-Final/expr-equals/result-eq-graph-5.ttl   |  11 -
 .../DAWG-Final/expr-equals/result-eq2-1.ttl        | 288 --------
 .../DAWG-Final/expr-equals/result-eq2-2.ttl        | 104 ---
 .../DAWG-Final/expr-equals/result-eq2-graph-1.ttl  | 229 -------
 jena-arq/testing/DAWG-Final/expr-ops/LICENSE       |  49 --
 jena-arq/testing/DAWG-Final/expr-ops/data.ttl      |   7 -
 jena-arq/testing/DAWG-Final/expr-ops/manifest.ttl  | 102 ---
 jena-arq/testing/DAWG-Final/expr-ops/query-ge-1.rq |   5 -
 jena-arq/testing/DAWG-Final/expr-ops/query-le-1.rq |   5 -
 .../testing/DAWG-Final/expr-ops/query-minus-1.rq   |   6 -
 .../testing/DAWG-Final/expr-ops/query-mul-1.rq     |   6 -
 .../testing/DAWG-Final/expr-ops/query-plus-1.rq    |   6 -
 .../testing/DAWG-Final/expr-ops/query-unminus-1.rq |   5 -
 .../testing/DAWG-Final/expr-ops/query-unplus-1.rq  |   5 -
 .../testing/DAWG-Final/expr-ops/result-ge-1.srx    |  21 -
 .../testing/DAWG-Final/expr-ops/result-le-1.srx    |  21 -
 .../testing/DAWG-Final/expr-ops/result-minus-1.srx |  16 -
 .../testing/DAWG-Final/expr-ops/result-mul-1.srx   |  26 -
 .../testing/DAWG-Final/expr-ops/result-plus-1.srx  |  21 -
 .../DAWG-Final/expr-ops/result-unminus-1.srx       |  16 -
 .../DAWG-Final/expr-ops/result-unplus-1.srx        |  16 -
 jena-arq/testing/DAWG-Final/graph/LICENSE          |  49 --
 jena-arq/testing/DAWG-Final/graph/data-g1.ttl      |   5 -
 jena-arq/testing/DAWG-Final/graph/data-g2.ttl      |   4 -
 jena-arq/testing/DAWG-Final/graph/data-g3-dup.ttl  |   5 -
 jena-arq/testing/DAWG-Final/graph/data-g3.ttl      |   5 -
 jena-arq/testing/DAWG-Final/graph/data-g4.ttl      |   4 -
 jena-arq/testing/DAWG-Final/graph/graph-01.rq      |   3 -
 jena-arq/testing/DAWG-Final/graph/graph-01.ttl     |  29 -
 jena-arq/testing/DAWG-Final/graph/graph-02.rq      |   3 -
 jena-arq/testing/DAWG-Final/graph/graph-02.ttl     |   8 -
 jena-arq/testing/DAWG-Final/graph/graph-03.rq      |   6 -
 jena-arq/testing/DAWG-Final/graph/graph-03.ttl     |  36 -
 jena-arq/testing/DAWG-Final/graph/graph-04.rq      |   6 -
 jena-arq/testing/DAWG-Final/graph/graph-04.ttl     |   9 -
 jena-arq/testing/DAWG-Final/graph/graph-05.rq      |   3 -
 jena-arq/testing/DAWG-Final/graph/graph-05.ttl     |  29 -
 jena-arq/testing/DAWG-Final/graph/graph-06.rq      |   6 -
 jena-arq/testing/DAWG-Final/graph/graph-06.ttl     |  23 -
 jena-arq/testing/DAWG-Final/graph/graph-07.rq      |   8 -
 jena-arq/testing/DAWG-Final/graph/graph-07.ttl     |  43 --
 jena-arq/testing/DAWG-Final/graph/graph-08.rq      |   7 -
 jena-arq/testing/DAWG-Final/graph/graph-08.ttl     |  31 -
 jena-arq/testing/DAWG-Final/graph/graph-09.rq      |   7 -
 jena-arq/testing/DAWG-Final/graph/graph-09.ttl     |  11 -
 jena-arq/testing/DAWG-Final/graph/graph-10.rq      |   7 -
 jena-arq/testing/DAWG-Final/graph/graph-10.ttl     |  11 -
 jena-arq/testing/DAWG-Final/graph/graph-11.rq      |   8 -
 jena-arq/testing/DAWG-Final/graph/graph-11.ttl     | 108 ---
 jena-arq/testing/DAWG-Final/graph/manifest.ttl     | 195 ------
 jena-arq/testing/DAWG-Final/i18n/.htaccess         |   6 -
 jena-arq/testing/DAWG-Final/i18n/LICENSE           |  49 --
 .../testing/DAWG-Final/i18n/kanji-01-results.ttl   |  22 -
 jena-arq/testing/DAWG-Final/i18n/kanji-01.rq       |   7 -
 .../testing/DAWG-Final/i18n/kanji-02-results.ttl   |  11 -
 jena-arq/testing/DAWG-Final/i18n/kanji-02.rq       |   7 -
 jena-arq/testing/DAWG-Final/i18n/kanji.ttl         |  20 -
 jena-arq/testing/DAWG-Final/i18n/manifest.ttl      |  93 ---
 .../DAWG-Final/i18n/normalization-01-results.ttl   |  15 -
 .../testing/DAWG-Final/i18n/normalization-01.rq    |   6 -
 .../testing/DAWG-Final/i18n/normalization-01.ttl   |  23 -
 .../DAWG-Final/i18n/normalization-02-results.ttl   |  14 -
 .../testing/DAWG-Final/i18n/normalization-02.rq    |   8 -
 .../testing/DAWG-Final/i18n/normalization-02.ttl   |   8 -
 .../DAWG-Final/i18n/normalization-03-results.ttl   |  14 -
 .../testing/DAWG-Final/i18n/normalization-03.rq    |   8 -
 .../testing/DAWG-Final/i18n/normalization-03.ttl   |   9 -
 .../testing/DAWG-Final/manifest-evaluation.ttl     |  55 --
 jena-arq/testing/DAWG-Final/manifest-syntax.ttl    |  29 -
 jena-arq/testing/DAWG-Final/open-world/LICENSE     |  49 --
 jena-arq/testing/DAWG-Final/open-world/data-1.ttl  |  17 -
 jena-arq/testing/DAWG-Final/open-world/data-2.ttl  |  20 -
 jena-arq/testing/DAWG-Final/open-world/data-3.ttl  |  15 -
 jena-arq/testing/DAWG-Final/open-world/data-4.ttl  |  15 -
 .../DAWG-Final/open-world/date-1-result.srx        |  20 -
 jena-arq/testing/DAWG-Final/open-world/date-1.rq   |   8 -
 .../DAWG-Final/open-world/date-2-result.srx        |  36 -
 jena-arq/testing/DAWG-Final/open-world/date-2.rq   |   8 -
 .../DAWG-Final/open-world/date-3-result.srx        |  36 -
 jena-arq/testing/DAWG-Final/open-world/date-3.rq   |   8 -
 .../DAWG-Final/open-world/date-4-result.srx        |  36 -
 jena-arq/testing/DAWG-Final/open-world/date-4.rq   |   8 -
 .../testing/DAWG-Final/open-world/manifest.ttl     | 238 -------
 .../DAWG-Final/open-world/open-cmp-01-result.srx   |  24 -
 .../testing/DAWG-Final/open-world/open-cmp-01.rq   |   8 -
 .../DAWG-Final/open-world/open-cmp-02-result.srx   |  46 --
 .../testing/DAWG-Final/open-world/open-cmp-02.rq   |   8 -
 .../DAWG-Final/open-world/open-eq-01-result.srx    |  11 -
 .../testing/DAWG-Final/open-world/open-eq-01.rq    |  13 -
 .../DAWG-Final/open-world/open-eq-02-result.srx    |  16 -
 .../testing/DAWG-Final/open-world/open-eq-02.rq    |   8 -
 .../DAWG-Final/open-world/open-eq-03-result.srx    |  28 -
 .../testing/DAWG-Final/open-world/open-eq-03.rq    |  14 -
 .../DAWG-Final/open-world/open-eq-04-result.srx    |  28 -
 .../testing/DAWG-Final/open-world/open-eq-04.rq    |  14 -
 .../DAWG-Final/open-world/open-eq-05-result.srx    |  20 -
 .../testing/DAWG-Final/open-world/open-eq-05.rq    |  11 -
 .../DAWG-Final/open-world/open-eq-06-result.srx    |  12 -
 .../testing/DAWG-Final/open-world/open-eq-06.rq    |  12 -
 .../DAWG-Final/open-world/open-eq-07-result.srx    | 182 -----
 .../testing/DAWG-Final/open-world/open-eq-07.rq    |   9 -
 .../DAWG-Final/open-world/open-eq-08-result.srx    | 602 -----------------
 .../testing/DAWG-Final/open-world/open-eq-08.rq    |   9 -
 .../DAWG-Final/open-world/open-eq-09-result.srx    |  14 -
 .../testing/DAWG-Final/open-world/open-eq-09.rq    |   9 -
 .../DAWG-Final/open-world/open-eq-10-result.srx    | 742 ---------------------
 .../testing/DAWG-Final/open-world/open-eq-10.rq    |   9 -
 .../DAWG-Final/open-world/open-eq-11-result.srx    | 742 ---------------------
 .../testing/DAWG-Final/open-world/open-eq-11.rq    |   9 -
 .../DAWG-Final/open-world/open-eq-12-result.srx    | 154 -----
 .../testing/DAWG-Final/open-world/open-eq-12.rq    |  10 -
 .../open-world/sameTerm-StringSimpleLiteralCmp.srx |  56 --
 .../sameTerm-eq-StringSimpleLiteralCmp.srx         |  56 --
 .../testing/DAWG-Final/open-world/sameTerm-eq.srx  |  56 --
 .../DAWG-Final/open-world/sameTerm-manifest.ttl    |  61 --
 .../sameTerm-not-eq-StringSimpleLiteralCmp.srx     |  56 --
 .../DAWG-Final/open-world/sameTerm-not-eq.srx      |  17 -
 .../testing/DAWG-Final/open-world/sameTerm.srx     |  56 --
 .../testing/DAWG-Final/open-world/sameTerm.ttl     |   8 -
 .../testing/DAWG-Final/optional-filter/LICENSE     |  49 --
 .../testing/DAWG-Final/optional-filter/data-1.ttl  |  12 -
 .../DAWG-Final/optional-filter/expr-1-result.ttl   |  27 -
 .../testing/DAWG-Final/optional-filter/expr-1.rq   |  10 -
 .../DAWG-Final/optional-filter/expr-2-result.ttl   |  17 -
 .../testing/DAWG-Final/optional-filter/expr-2.rq   |   9 -
 .../DAWG-Final/optional-filter/expr-3-result.ttl   |  22 -
 .../testing/DAWG-Final/optional-filter/expr-3.rq   |   9 -
 .../DAWG-Final/optional-filter/expr-4-result.ttl   |  24 -
 .../testing/DAWG-Final/optional-filter/expr-4.rq   |  10 -
 .../expr-5-result-not-simplified.ttl               |  24 -
 .../optional-filter/expr-5-result-simplified.ttl   |  27 -
 .../testing/DAWG-Final/optional-filter/expr-5.rq   |  13 -
 .../DAWG-Final/optional-filter/manifest.ttl        |  90 ---
 jena-arq/testing/DAWG-Final/optional/LICENSE       |  49 --
 .../testing/DAWG-Final/optional/complex-data-1.ttl |  21 -
 .../testing/DAWG-Final/optional/complex-data-2.ttl |  32 -
 jena-arq/testing/DAWG-Final/optional/data.ttl      |  11 -
 jena-arq/testing/DAWG-Final/optional/manifest.ttl  | 114 ----
 jena-arq/testing/DAWG-Final/optional/q-opt-1.rq    |   7 -
 jena-arq/testing/DAWG-Final/optional/q-opt-2.rq    |   8 -
 jena-arq/testing/DAWG-Final/optional/q-opt-3.rq    |   8 -
 .../testing/DAWG-Final/optional/q-opt-complex-1.rq |  11 -
 .../testing/DAWG-Final/optional/q-opt-complex-2.rq |  16 -
 .../testing/DAWG-Final/optional/q-opt-complex-3.rq |  17 -
 .../testing/DAWG-Final/optional/q-opt-complex-4.rq |  15 -
 .../testing/DAWG-Final/optional/result-opt-1.ttl   |  25 -
 .../testing/DAWG-Final/optional/result-opt-2.ttl   |  32 -
 .../testing/DAWG-Final/optional/result-opt-3.ttl   |  33 -
 .../DAWG-Final/optional/result-opt-complex-1.ttl   |  34 -
 .../DAWG-Final/optional/result-opt-complex-2.ttl   |  16 -
 .../DAWG-Final/optional/result-opt-complex-3.ttl   |  33 -
 .../DAWG-Final/optional/result-opt-complex-4.ttl   |  48 --
 jena-arq/testing/DAWG-Final/reduced/LICENSE        |  49 --
 jena-arq/testing/DAWG-Final/reduced/manifest.ttl   |  53 --
 jena-arq/testing/DAWG-Final/reduced/reduced-1.rq   |   7 -
 jena-arq/testing/DAWG-Final/reduced/reduced-1.srx  |  24 -
 jena-arq/testing/DAWG-Final/reduced/reduced-2.rq   |   7 -
 jena-arq/testing/DAWG-Final/reduced/reduced-2.srx  | 101 ---
 .../testing/DAWG-Final/reduced/reduced-star.ttl    |   8 -
 .../testing/DAWG-Final/reduced/reduced-str.ttl     |  29 -
 jena-arq/testing/DAWG-Final/regex/LICENSE          |  49 --
 jena-arq/testing/DAWG-Final/regex/manifest.ttl     |  72 --
 .../testing/DAWG-Final/regex/regex-data-01.ttl     |   5 -
 .../testing/DAWG-Final/regex/regex-query-001.rq    |   8 -
 .../testing/DAWG-Final/regex/regex-query-002.rq    |   8 -
 .../testing/DAWG-Final/regex/regex-query-003.rq    |   8 -
 .../testing/DAWG-Final/regex/regex-query-004.rq    |   7 -
 .../testing/DAWG-Final/regex/regex-result-001.ttl  |  10 -
 .../testing/DAWG-Final/regex/regex-result-002.ttl  |  14 -
 .../testing/DAWG-Final/regex/regex-result-003.ttl  |  10 -
 .../testing/DAWG-Final/regex/regex-result-004.ttl  |  14 -
 jena-arq/testing/DAWG-Final/slice/LICENSE          |  49 --
 jena-arq/testing/DAWG-Final/solution-seq/LICENSE   |  49 --
 jena-arq/testing/DAWG-Final/solution-seq/data.ttl  |  18 -
 .../testing/DAWG-Final/solution-seq/manifest.ttl   | 132 ----
 .../testing/DAWG-Final/solution-seq/slice-01.rq    |   6 -
 .../testing/DAWG-Final/solution-seq/slice-02.rq    |   7 -
 .../testing/DAWG-Final/solution-seq/slice-03.rq    |   6 -
 .../testing/DAWG-Final/solution-seq/slice-04.rq    |   6 -
 .../testing/DAWG-Final/solution-seq/slice-10.rq    |   6 -
 .../testing/DAWG-Final/solution-seq/slice-11.rq    |   6 -
 .../testing/DAWG-Final/solution-seq/slice-12.rq    |   6 -
 .../testing/DAWG-Final/solution-seq/slice-13.rq    |   6 -
 .../testing/DAWG-Final/solution-seq/slice-20.rq    |   8 -
 .../testing/DAWG-Final/solution-seq/slice-21.rq    |   7 -
 .../testing/DAWG-Final/solution-seq/slice-22.rq    |   7 -
 .../testing/DAWG-Final/solution-seq/slice-23.rq    |   7 -
 .../testing/DAWG-Final/solution-seq/slice-24.rq    |   7 -
 .../DAWG-Final/solution-seq/slice-results-01.ttl   |  12 -
 .../DAWG-Final/solution-seq/slice-results-02.ttl   |  47 --
 .../DAWG-Final/solution-seq/slice-results-03.ttl   |   6 -
 .../DAWG-Final/solution-seq/slice-results-04.ttl   |  32 -
 .../DAWG-Final/solution-seq/slice-results-10.ttl   |  42 --
 .../DAWG-Final/solution-seq/slice-results-11.ttl   |  47 --
 .../DAWG-Final/solution-seq/slice-results-12.ttl   |   6 -
 .../DAWG-Final/solution-seq/slice-results-13.ttl   |  22 -
 .../DAWG-Final/solution-seq/slice-results-20.ttl   |  12 -
 .../DAWG-Final/solution-seq/slice-results-21.ttl   |  18 -
 .../DAWG-Final/solution-seq/slice-results-22.ttl   |   6 -
 .../DAWG-Final/solution-seq/slice-results-23.ttl   |  32 -
 .../DAWG-Final/solution-seq/slice-results-24.ttl   |  22 -
 jena-arq/testing/DAWG-Final/sort/LICENSE           |  49 --
 jena-arq/testing/DAWG-Final/sort/data-sort-1.ttl   |   7 -
 jena-arq/testing/DAWG-Final/sort/data-sort-11.ttl  |  15 -
 jena-arq/testing/DAWG-Final/sort/data-sort-3.ttl   |  17 -
 jena-arq/testing/DAWG-Final/sort/data-sort-4.ttl   |  22 -
 jena-arq/testing/DAWG-Final/sort/data-sort-6.ttl   |  20 -
 jena-arq/testing/DAWG-Final/sort/data-sort-7.ttl   |  19 -
 jena-arq/testing/DAWG-Final/sort/data-sort-8.ttl   |  13 -
 jena-arq/testing/DAWG-Final/sort/data-sort-9.ttl   |  10 -
 .../testing/DAWG-Final/sort/data-sort-builtin.ttl  |   7 -
 .../testing/DAWG-Final/sort/data-sort-function.ttl |   6 -
 .../testing/DAWG-Final/sort/data-sort-numbers.ttl  |   7 -
 .../testing/DAWG-Final/sort/extended-manifest.ttl  |  19 -
 jena-arq/testing/DAWG-Final/sort/manifest.ttl      | 163 -----
 jena-arq/testing/DAWG-Final/sort/query-sort-1.rq   |   4 -
 jena-arq/testing/DAWG-Final/sort/query-sort-10.rq  |   4 -
 jena-arq/testing/DAWG-Final/sort/query-sort-2.rq   |   4 -
 jena-arq/testing/DAWG-Final/sort/query-sort-3.rq   |   6 -
 jena-arq/testing/DAWG-Final/sort/query-sort-4.rq   |   8 -
 jena-arq/testing/DAWG-Final/sort/query-sort-5.rq   |   8 -
 jena-arq/testing/DAWG-Final/sort/query-sort-6.rq   |   5 -
 jena-arq/testing/DAWG-Final/sort/query-sort-9.rq   |   4 -
 .../testing/DAWG-Final/sort/query-sort-builtin.rq  |   4 -
 .../testing/DAWG-Final/sort/query-sort-function.rq |   5 -
 .../testing/DAWG-Final/sort/query-sort-numbers.rq  |   4 -
 jena-arq/testing/DAWG-Final/sort/result-sort-1.rdf |  38 --
 .../testing/DAWG-Final/sort/result-sort-10.rdf     |  38 --
 .../testing/DAWG-Final/sort/result-sort-11.ttl     |  49 --
 jena-arq/testing/DAWG-Final/sort/result-sort-2.rdf |  38 --
 jena-arq/testing/DAWG-Final/sort/result-sort-3.rdf |  56 --
 jena-arq/testing/DAWG-Final/sort/result-sort-4.rdf |  71 --
 jena-arq/testing/DAWG-Final/sort/result-sort-5.rdf |  72 --
 jena-arq/testing/DAWG-Final/sort/result-sort-6.rdf |  42 --
 jena-arq/testing/DAWG-Final/sort/result-sort-7.rdf |  59 --
 jena-arq/testing/DAWG-Final/sort/result-sort-8.rdf |  48 --
 jena-arq/testing/DAWG-Final/sort/result-sort-9.rdf |  38 --
 .../DAWG-Final/sort/result-sort-builtin.ttl        |  25 -
 .../DAWG-Final/sort/result-sort-function.ttl       |  25 -
 .../DAWG-Final/sort/result-sort-numbers.ttl        |  25 -
 jena-arq/testing/DAWG-Final/syntax-sparql1/LICENSE |  49 --
 .../testing/DAWG-Final/syntax-sparql1/manifest.ttl | 539 ---------------
 .../DAWG-Final/syntax-sparql1/syntax-basic-01.rq   |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-basic-02.rq   |   1 -
 .../DAWG-Final/syntax-sparql1/syntax-basic-03.rq   |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-basic-04.rq   |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-basic-05.rq   |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-basic-06.rq   |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-bnodes-01.rq  |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-bnodes-02.rq  |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-bnodes-03.rq  |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-bnodes-04.rq  |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-bnodes-05.rq  |   5 -
 .../DAWG-Final/syntax-sparql1/syntax-expr-01.rq    |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-expr-02.rq    |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-expr-03.rq    |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-expr-04.rq    |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-expr-05.rq    |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-forms-01.rq   |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-forms-02.rq   |   2 -
 .../syntax-sparql1/syntax-limit-offset-01.rq       |   5 -
 .../syntax-sparql1/syntax-limit-offset-02.rq       |   7 -
 .../syntax-sparql1/syntax-limit-offset-03.rq       |   7 -
 .../syntax-sparql1/syntax-limit-offset-04.rq       |   5 -
 .../DAWG-Final/syntax-sparql1/syntax-lists-01.rq   |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-lists-02.rq   |   2 -
 .../DAWG-Final/syntax-sparql1/syntax-lists-03.rq   |   1 -
 .../DAWG-Final/syntax-sparql1/syntax-lists-04.rq   |   1 -
 .../DAWG-Final/syntax-sparql1/syntax-lists-05.rq   |   1 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-01.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-02.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-03.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-04.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-05.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-06.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-07.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-08.rq     |  11 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-09.rq     |   6 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-10.rq     |   5 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-11.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-12.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-13.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-14.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-15.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-16.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-17.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-18.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-19.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-lit-20.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-order-01.rq   |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-order-02.rq   |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-order-03.rq   |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-order-04.rq   |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-order-05.rq   |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-order-06.rq   |   5 -
 .../DAWG-Final/syntax-sparql1/syntax-order-07.rq   |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-pat-01.rq     |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-pat-02.rq     |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-pat-03.rq     |   7 -
 .../DAWG-Final/syntax-sparql1/syntax-pat-04.rq     |   8 -
 .../DAWG-Final/syntax-sparql1/syntax-qname-01.rq   |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-qname-02.rq   |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-qname-03.rq   |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-qname-04.rq   |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-qname-05.rq   |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-qname-06.rq   |   3 -
 .../DAWG-Final/syntax-sparql1/syntax-qname-07.rq   |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-qname-08.rq   |   5 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-01.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-02.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-03.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-05.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-06.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-07.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-08.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-09.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-10.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-11.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-12.rq  |   4 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-13.rq  |   6 -
 .../DAWG-Final/syntax-sparql1/syntax-struct-14.rq  |   6 -
 .../DAWG-Final/syntax-sparql1/syntax-union-01.rq   |   5 -
 .../DAWG-Final/syntax-sparql1/syntax-union-02.rq   |   5 -
 jena-arq/testing/DAWG-Final/syntax-sparql2/LICENSE |  49 --
 .../testing/DAWG-Final/syntax-sparql2/manifest.ttl | 363 ----------
 .../DAWG-Final/syntax-sparql2/syntax-bnode-01.rq   |   2 -
 .../DAWG-Final/syntax-sparql2/syntax-bnode-02.rq   |   4 -
 .../DAWG-Final/syntax-sparql2/syntax-bnode-03.rq   |   3 -
 .../DAWG-Final/syntax-sparql2/syntax-dataset-01.rq |   4 -
 .../DAWG-Final/syntax-sparql2/syntax-dataset-02.rq |   4 -
 .../DAWG-Final/syntax-sparql2/syntax-dataset-03.rq |   5 -
 .../DAWG-Final/syntax-sparql2/syntax-dataset-04.rq |   7 -
 .../DAWG-Final/syntax-sparql2/syntax-esc-01.rq     |   2 -
 .../DAWG-Final/syntax-sparql2/syntax-esc-02.rq     |   2 -
 .../DAWG-Final/syntax-sparql2/syntax-esc-03.rq     |   2 -
 .../DAWG-Final/syntax-sparql2/syntax-esc-04.rq     |   3 -
 .../DAWG-Final/syntax-sparql2/syntax-esc-05.rq     |   5 -
 .../syntax-sparql2/syntax-form-ask-02.rq           |   1 -
 .../syntax-sparql2/syntax-form-construct01.rq      |   1 -
 .../syntax-sparql2/syntax-form-construct02.rq      |   1 -
 .../syntax-sparql2/syntax-form-construct03.rq      |   5 -
 .../syntax-sparql2/syntax-form-construct04.rq      |   5 -
 .../syntax-sparql2/syntax-form-construct06.rq      |   1 -
 .../syntax-sparql2/syntax-form-describe01.rq       |   1 -
 .../syntax-sparql2/syntax-form-describe02.rq       |   1 -
 .../syntax-sparql2/syntax-form-select-01.rq        |   1 -
 .../syntax-sparql2/syntax-form-select-02.rq        |   1 -
 .../syntax-sparql2/syntax-function-01.rq           |   2 -
 .../syntax-sparql2/syntax-function-02.rq           |   2 -
 .../syntax-sparql2/syntax-function-03.rq           |   3 -
 .../syntax-sparql2/syntax-function-04.rq           |   4 -
 .../DAWG-Final/syntax-sparql2/syntax-general-01.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-02.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-03.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-04.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-05.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-06.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-07.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-08.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-09.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-10.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-11.rq |   1 -
 .../DAWG-Final/syntax-sparql2/syntax-general-12.rq |   2 -
 .../DAWG-Final/syntax-sparql2/syntax-general-13.rq |   3 -
 .../DAWG-Final/syntax-sparql2/syntax-general-14.rq |   3 -
 .../DAWG-Final/syntax-sparql2/syntax-graph-01.rq   |   6 -
 .../DAWG-Final/syntax-sparql2/syntax-graph-02.rq   |   6 -
 .../DAWG-Final/syntax-sparql2/syntax-graph-03.rq   |   6 -
 .../DAWG-Final/syntax-sparql2/syntax-graph-04.rq   |   7 -
 .../DAWG-Final/syntax-sparql2/syntax-graph-05.rq   |   7 -
 .../syntax-sparql2/syntax-keywords-01.rq           |   4 -
 .../syntax-sparql2/syntax-keywords-02.rq           |   4 -
 .../syntax-sparql2/syntax-keywords-03.rq           |   4 -
 .../DAWG-Final/syntax-sparql2/syntax-lists-01.rq   |   2 -
 .../DAWG-Final/syntax-sparql2/syntax-lists-02.rq   |   2 -
 .../DAWG-Final/syntax-sparql2/syntax-lists-03.rq   |   3 -
 .../DAWG-Final/syntax-sparql2/syntax-lists-04.rq   |   3 -
 .../DAWG-Final/syntax-sparql2/syntax-lists-05.rq   |   3 -
 jena-arq/testing/DAWG-Final/syntax-sparql3/LICENSE |  49 --
 .../testing/DAWG-Final/syntax-sparql3/manifest.ttl | 344 ----------
 .../testing/DAWG-Final/syntax-sparql3/syn-01.rq    |   3 -
 .../testing/DAWG-Final/syntax-sparql3/syn-02.rq    |   3 -
 .../testing/DAWG-Final/syntax-sparql3/syn-03.rq    |   2 -
 .../testing/DAWG-Final/syntax-sparql3/syn-04.rq    |   3 -
 .../testing/DAWG-Final/syntax-sparql3/syn-05.rq    |   3 -
 .../testing/DAWG-Final/syntax-sparql3/syn-06.rq    |   3 -
 .../testing/DAWG-Final/syntax-sparql3/syn-07.rq    |   4 -
 .../testing/DAWG-Final/syntax-sparql3/syn-08.rq    |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-01.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-02.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-03.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-04.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-05.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-06.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-07.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-08.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-09.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-10.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-11.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-12.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-13.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-14.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-15.rq        |   3 -
 .../DAWG-Final/syntax-sparql3/syn-bad-16.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-17.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-18.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-19.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-20.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-21.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-22.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-23.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-24.rq        |   4 -
 .../DAWG-Final/syntax-sparql3/syn-bad-25.rq        |   1 -
 .../DAWG-Final/syntax-sparql3/syn-bad-26.rq        |   5 -
 .../DAWG-Final/syntax-sparql3/syn-bad-27.rq        |   2 -
 .../DAWG-Final/syntax-sparql3/syn-bad-28.rq        |   2 -
 .../DAWG-Final/syntax-sparql3/syn-bad-29.rq        |   2 -
 .../DAWG-Final/syntax-sparql3/syn-bad-30.rq        |   2 -
 .../DAWG-Final/syntax-sparql3/syn-bad-31.rq        |   6 -
 .../DAWG-Final/syntax-sparql3/syn-bad-bnode-dot.rq |   2 -
 .../syn-bad-bnodes-missing-pvalues-01.rq           |   3 -
 .../syn-bad-bnodes-missing-pvalues-02.rq           |   2 -
 .../syntax-sparql3/syn-bad-empty-optional-01.rq    |   2 -
 .../syntax-sparql3/syn-bad-empty-optional-02.rq    |   2 -
 .../syn-bad-filter-missing-parens.rq               |   2 -
 .../DAWG-Final/syntax-sparql3/syn-bad-lone-list.rq |   2 -
 .../DAWG-Final/syntax-sparql3/syn-bad-lone-node.rq |   2 -
 .../syntax-sparql3/syn-blabel-cross-filter.rq      |   7 -
 .../syntax-sparql3/syn-blabel-cross-graph-bad.rq   |   7 -
 .../syn-blabel-cross-optional-bad.rq               |   9 -
 .../syntax-sparql3/syn-blabel-cross-union-bad.rq   |  11 -
 jena-arq/testing/DAWG-Final/syntax-sparql4/LICENSE |  49 --
 .../testing/DAWG-Final/syntax-sparql4/manifest.ttl | 106 ---
 .../testing/DAWG-Final/syntax-sparql4/syn-09.rq    |   6 -
 .../testing/DAWG-Final/syntax-sparql4/syn-10.rq    |   6 -
 .../testing/DAWG-Final/syntax-sparql4/syn-11.rq    |   6 -
 .../DAWG-Final/syntax-sparql4/syn-bad-34.rq        |   6 -
 .../DAWG-Final/syntax-sparql4/syn-bad-35.rq        |   6 -
 .../DAWG-Final/syntax-sparql4/syn-bad-36.rq        |   6 -
 .../DAWG-Final/syntax-sparql4/syn-bad-37.rq        |   6 -
 .../DAWG-Final/syntax-sparql4/syn-bad-38.rq        |   6 -
 .../syntax-sparql4/syn-bad-GRAPH-breaks-BGP.rq     |   9 -
 .../syntax-sparql4/syn-bad-OPT-breaks-BGP.rq       |   9 -
 .../syntax-sparql4/syn-bad-UNION-breaks-BGP.rq     |  11 -
 .../syn-leading-digits-in-prefixed-names.rq        |   8 -
 jena-arq/testing/DAWG-Final/syntax-sparql5/LICENSE |  49 --
 .../testing/DAWG-Final/syntax-sparql5/manifest.ttl |  42 --
 .../DAWG-Final/syntax-sparql5/syntax-reduced-01.rq |   1 -
 .../DAWG-Final/syntax-sparql5/syntax-reduced-02.rq |   1 -
 jena-arq/testing/DAWG-Final/syntax/LICENSE         |  49 --
 jena-arq/testing/DAWG-Final/triple-match/LICENSE   |  49 --
 .../testing/DAWG-Final/triple-match/data-01.ttl    |   4 -
 .../testing/DAWG-Final/triple-match/data-02.ttl    |   7 -
 .../testing/DAWG-Final/triple-match/data-03.ttl    |   4 -
 .../DAWG-Final/triple-match/dawg-data-01.ttl       |  29 -
 .../testing/DAWG-Final/triple-match/dawg-tp-01.rq  |   4 -
 .../testing/DAWG-Final/triple-match/dawg-tp-02.rq  |   5 -
 .../testing/DAWG-Final/triple-match/dawg-tp-03.rq  |   2 -
 .../testing/DAWG-Final/triple-match/dawg-tp-04.rq  |   8 -
 .../testing/DAWG-Final/triple-match/dawg-tp-05.rq  |   5 -
 .../testing/DAWG-Final/triple-match/manifest.ttl   |  75 ---
 .../DAWG-Final/triple-match/result-tp-01.ttl       |  20 -
 .../DAWG-Final/triple-match/result-tp-02.ttl       |  20 -
 .../DAWG-Final/triple-match/result-tp-03.ttl       |  13 -
 .../DAWG-Final/triple-match/result-tp-04.ttl       |  18 -
 jena-arq/testing/DAWG-Final/type-promotion/LICENSE |  49 --
 .../testing/DAWG-Final/type-promotion/false.ttl    |   9 -
 .../testing/DAWG-Final/type-promotion/manifest.ttl | 421 ------------
 .../type-promotion/tP-byte-short-fail.rq           |  10 -
 .../DAWG-Final/type-promotion/tP-byte-short.rq     |  10 -
 .../type-promotion/tP-decimal-decimal.rq           |  10 -
 .../type-promotion/tP-double-decimal-fail.rq       |  10 -
 .../DAWG-Final/type-promotion/tP-double-decimal.rq |  10 -
 .../DAWG-Final/type-promotion/tP-double-double.rq  |  10 -
 .../type-promotion/tP-double-float-fail.rq         |  10 -
 .../DAWG-Final/type-promotion/tP-double-float.rq   |  10 -
 .../type-promotion/tP-float-decimal-fail.rq        |  10 -
 .../DAWG-Final/type-promotion/tP-float-decimal.rq  |  10 -
 .../DAWG-Final/type-promotion/tP-float-float.rq    |  10 -
 .../DAWG-Final/type-promotion/tP-int-short.rq      |  10 -
 .../DAWG-Final/type-promotion/tP-integer-short.rq  |  10 -
 .../DAWG-Final/type-promotion/tP-long-short.rq     |  10 -
 .../type-promotion/tP-negativeInteger-short.rq     |  10 -
 .../type-promotion/tP-nonNegativeInteger-short.rq  |  10 -
 .../type-promotion/tP-nonPositiveInteger-short.rq  |  10 -
 .../type-promotion/tP-positiveInteger-short.rq     |  10 -
 .../type-promotion/tP-short-byte-fail.rq           |  10 -
 .../DAWG-Final/type-promotion/tP-short-decimal.rq  |  10 -
 .../DAWG-Final/type-promotion/tP-short-double.rq   |  10 -
 .../DAWG-Final/type-promotion/tP-short-float.rq    |  10 -
 .../DAWG-Final/type-promotion/tP-short-int-fail.rq |  10 -
 .../type-promotion/tP-short-long-fail.rq           |  10 -
 .../type-promotion/tP-short-short-fail.rq          |  10 -
 .../DAWG-Final/type-promotion/tP-short-short.rq    |  10 -
 .../type-promotion/tP-unsignedByte-short.rq        |  10 -
 .../type-promotion/tP-unsignedInt-short.rq         |  10 -
 .../type-promotion/tP-unsignedLong-short.rq        |  10 -
 .../type-promotion/tP-unsignedShort-short.rq       |  10 -
 jena-arq/testing/DAWG-Final/type-promotion/tP.ttl  |  28 -
 .../testing/DAWG-Final/type-promotion/true.ttl     |   9 -
 jena-arq/testing/DAWG-Final_data-r2.zip            | Bin 405469 -> 0 bytes
 jena-arq/testing/DAWG/LICENSE                      |  49 --
 jena-arq/testing/DAWG/Misc/LICENSE                 |  49 --
 jena-arq/testing/DAWG/Misc/dawg-data-01.n3         |  29 -
 jena-arq/testing/DAWG/Misc/dawg-query-001.rq       |   9 -
 jena-arq/testing/DAWG/Misc/dawg-query-002.rq       |  14 -
 jena-arq/testing/DAWG/Misc/dawg-query-003.rq       |  12 -
 jena-arq/testing/DAWG/Misc/dawg-query-004.rq       |   6 -
 jena-arq/testing/DAWG/Misc/dawg-result-001.n3      |  31 -
 jena-arq/testing/DAWG/Misc/dawg-result-002.n3      |  24 -
 jena-arq/testing/DAWG/Misc/dawg-result-003.n3      |  35 -
 jena-arq/testing/DAWG/Misc/dawg-result-004.n3      |  20 -
 jena-arq/testing/DAWG/Misc/manifest.n3             |  61 --
 jena-arq/testing/DAWG/Syntax/LICENSE               |  49 --
 jena-arq/testing/DAWG/Syntax/manifest.n3           |  53 --
 jena-arq/testing/DAWG/Syntax/result-syn-001.n3     |  18 -
 jena-arq/testing/DAWG/Syntax/result-syn-002.n3     |  18 -
 jena-arq/testing/DAWG/Syntax/result-syn-003.n3     |  14 -
 jena-arq/testing/DAWG/Syntax/result-syn-004.n3     |  10 -
 jena-arq/testing/DAWG/Syntax/syn-data-01.n3        |   4 -
 jena-arq/testing/DAWG/Syntax/syn-data-02.n3        |   4 -
 jena-arq/testing/DAWG/Syntax/syntax-001.rq         |   2 -
 jena-arq/testing/DAWG/Syntax/syntax-002.rq         |   2 -
 jena-arq/testing/DAWG/Syntax/syntax-003.rq         |   2 -
 jena-arq/testing/DAWG/Syntax/syntax-004.rq         |   4 -
 jena-arq/testing/DAWG/examples/LICENSE             |  49 --
 .../testing/DAWG/examples/ex11.2.3.1_0-result.n3   |  21 -
 jena-arq/testing/DAWG/examples/ex11.2.3.1_0.n3     |   9 -
 jena-arq/testing/DAWG/examples/ex11.2.3.1_0.rq     |   8 -
 .../testing/DAWG/examples/ex11.2.3.1_1-result.n3   |  11 -
 jena-arq/testing/DAWG/examples/ex11.2.3.1_1.n3     |   5 -
 jena-arq/testing/DAWG/examples/ex11.2.3.1_1.rq     |   8 -
 .../testing/DAWG/examples/ex11.2.3.2_0-result.n3   |  11 -
 jena-arq/testing/DAWG/examples/ex11.2.3.2_0.n3     |   8 -
 jena-arq/testing/DAWG/examples/ex11.2.3.2_0.rq     |   5 -
 .../testing/DAWG/examples/ex11.2.3.2_1-result.n3   |  11 -
 jena-arq/testing/DAWG/examples/ex11.2.3.2_1.rq     |   6 -
 .../testing/DAWG/examples/ex11.2.3.3_0-result.n3   |  14 -
 jena-arq/testing/DAWG/examples/ex11.2.3.3_0.n3     |   9 -
 jena-arq/testing/DAWG/examples/ex11.2.3.3_0.rq     |   5 -
 .../testing/DAWG/examples/ex11.2.3.4_0-result.n3   |  14 -
 jena-arq/testing/DAWG/examples/ex11.2.3.4_0.n3     |  11 -
 jena-arq/testing/DAWG/examples/ex11.2.3.4_0.rq     |  10 -
 .../testing/DAWG/examples/ex11.2.3.5_0-result.n3   |  14 -
 jena-arq/testing/DAWG/examples/ex11.2.3.5_0.n3     |   9 -
 jena-arq/testing/DAWG/examples/ex11.2.3.5_0.rq     |   5 -
 .../testing/DAWG/examples/ex11.2.3.6_0-result.n3   |  14 -
 jena-arq/testing/DAWG/examples/ex11.2.3.6_0.n3     |   8 -
 jena-arq/testing/DAWG/examples/ex11.2.3.6_0.rq     |   5 -
 .../testing/DAWG/examples/ex11.2.3.7_0-result.n3   |  14 -
 jena-arq/testing/DAWG/examples/ex11.2.3.7_0.n3     |   6 -
 jena-arq/testing/DAWG/examples/ex11.2.3.7_0.rq     |   5 -
 .../testing/DAWG/examples/ex11.2.3.8_0-result.n3   |  14 -
 jena-arq/testing/DAWG/examples/ex11.2.3.8_0.n3     |   9 -
 jena-arq/testing/DAWG/examples/ex11.2.3.8_0.rq     |   6 -
 jena-arq/testing/DAWG/examples/ex11_0-result.n3    |  11 -
 jena-arq/testing/DAWG/examples/ex11_0.n3           |   8 -
 jena-arq/testing/DAWG/examples/ex11_0.rq           |   8 -
 jena-arq/testing/DAWG/examples/ex11_1-result.n3    |  15 -
 jena-arq/testing/DAWG/examples/ex11_1.rq           |   9 -
 jena-arq/testing/DAWG/examples/ex2-1a-result.n3    |  10 -
 jena-arq/testing/DAWG/examples/ex2-1a.n3           |   1 -
 jena-arq/testing/DAWG/examples/ex2-1a.rq           |   3 -
 jena-arq/testing/DAWG/examples/ex2-1b.rq           |   4 -
 jena-arq/testing/DAWG/examples/ex2-1c.rq           |   5 -
 jena-arq/testing/DAWG/examples/ex2-1d.n3           |   3 -
 jena-arq/testing/DAWG/examples/ex2-1e.rq           |   5 -
 jena-arq/testing/DAWG/examples/ex2-1f.n3           |   6 -
 jena-arq/testing/DAWG/examples/ex2-2a-result.n3    |  14 -
 jena-arq/testing/DAWG/examples/ex2-2a.n3           |   2 -
 jena-arq/testing/DAWG/examples/ex2-2a.rq           |   3 -
 jena-arq/testing/DAWG/examples/ex2-3a-result.n3    |  11 -
 jena-arq/testing/DAWG/examples/ex2-3a.n3           |   4 -
 jena-arq/testing/DAWG/examples/ex2-3a.rq           |   6 -
 jena-arq/testing/DAWG/examples/ex2-4a-result.n3    |  21 -
 jena-arq/testing/DAWG/examples/ex2-4a.n3           |   6 -
 jena-arq/testing/DAWG/examples/ex2-4a.rq           |   6 -
 jena-arq/testing/DAWG/examples/ex3-result.n3       |  14 -
 jena-arq/testing/DAWG/examples/ex3.n3              |   8 -
 jena-arq/testing/DAWG/examples/ex3.rq              |   8 -
 jena-arq/testing/DAWG/examples/manifest.n3         | 178 -----
 jena-arq/testing/DAWG_data-r2.zip                  | Bin 0 -> 336385 bytes
 jena-arq/testing/Notes-test-variance               |  21 +-
 2376 files changed, 15 insertions(+), 51817 deletions(-)

diff --git a/jena-arq/testing/ARQ/Algebra/data-1.ttl b/jena-arq/testing/ARQ/Algebra/data-1.ttl
deleted file mode 100644
index 5237020df2..0000000000
--- a/jena-arq/testing/ARQ/Algebra/data-1.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-@prefix : <http://example/> .
-
-:x :p 1 .
diff --git a/jena-arq/testing/ARQ/Algebra/data-2.ttl b/jena-arq/testing/ARQ/Algebra/data-2.ttl
deleted file mode 100644
index 0d7af74395..0000000000
--- a/jena-arq/testing/ARQ/Algebra/data-2.ttl
+++ /dev/null
@@ -1,10 +0,0 @@
-@prefix : <http://example/> .
-
-:x :p 1 .
-:x :p 2 .
-:x :p 3 .
-:x :p 4 .
-
-:x :q 1 .
-:x :q 2 .
-:x :q 3 .
diff --git a/jena-arq/testing/ARQ/Algebra/filter-nested-1.rq b/jena-arq/testing/ARQ/Algebra/filter-nested-1.rq
deleted file mode 100644
index 78f28533c6..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-nested-1.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT ?v
-{ :x :p ?v . FILTER(?v = 1) }
diff --git a/jena-arq/testing/ARQ/Algebra/filter-nested-1.srx b/jena-arq/testing/ARQ/Algebra/filter-nested-1.srx
deleted file mode 100644
index 3a0f024ac7..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-nested-1.srx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/filter-nested-2.rq b/jena-arq/testing/ARQ/Algebra/filter-nested-2.rq
deleted file mode 100644
index 8430cef617..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-nested-2.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT ?v
-{ :x :p ?v . { FILTER(?v = 1) } }
diff --git a/jena-arq/testing/ARQ/Algebra/filter-nested-2.srx b/jena-arq/testing/ARQ/Algebra/filter-nested-2.srx
deleted file mode 100644
index 8ac7e1c723..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-nested-2.srx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/filter-placement-1.rq b/jena-arq/testing/ARQ/Algebra/filter-placement-1.rq
deleted file mode 100644
index cdabba47b9..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-placement-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-
-SELECT ?v 
-{ 
-    ?s :p ?v . 
-    FILTER (?v = 2)
-}
diff --git a/jena-arq/testing/ARQ/Algebra/filter-placement-1.srx b/jena-arq/testing/ARQ/Algebra/filter-placement-1.srx
deleted file mode 100644
index 7f4d990028..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-placement-1.srx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/filter-placement-2.rq b/jena-arq/testing/ARQ/Algebra/filter-placement-2.rq
deleted file mode 100644
index 0f4e1a3a13..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-placement-2.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/>
-
-SELECT ?v 
-{ 
-    FILTER (?v = 2)
-    ?s :p ?v . 
-}
diff --git a/jena-arq/testing/ARQ/Algebra/filter-placement-2.srx b/jena-arq/testing/ARQ/Algebra/filter-placement-2.srx
deleted file mode 100644
index 7f4d990028..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-placement-2.srx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/filter-placement-3.rq b/jena-arq/testing/ARQ/Algebra/filter-placement-3.rq
deleted file mode 100644
index f3be6d27bc..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-placement-3.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX : <http://example/>
-
-SELECT ?v ?w
-{ 
-    FILTER (?v = 2)
-    FILTER (?w = 3)
-    ?s :p ?v . 
-    ?s :q ?w .
-}
diff --git a/jena-arq/testing/ARQ/Algebra/filter-placement-3.srx b/jena-arq/testing/ARQ/Algebra/filter-placement-3.srx
deleted file mode 100644
index dc55af4f30..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-placement-3.srx
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/filter-scope-1.rq b/jena-arq/testing/ARQ/Algebra/filter-scope-1.rq
deleted file mode 100644
index 917a67ff9e..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-scope-1.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-    :x :p ?v . 
-    { :x :q ?w 
-      OPTIONAL {  :x :p ?v2 FILTER(?v = 1) }
-    }
-}
diff --git a/jena-arq/testing/ARQ/Algebra/filter-scope-1.srx b/jena-arq/testing/ARQ/Algebra/filter-scope-1.srx
deleted file mode 100644
index 34c182d107..0000000000
--- a/jena-arq/testing/ARQ/Algebra/filter-scope-1.srx
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-    <variable name="w"/>
-    <variable name="v2"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/manifest.ttl b/jena-arq/testing/ARQ/Algebra/manifest.ttl
deleted file mode 100644
index 3eed8183a0..0000000000
--- a/jena-arq/testing/ARQ/Algebra/manifest.ttl
+++ /dev/null
@@ -1,141 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "Algebra" ;
-    mf:entries
-    (   <#nested-opt-1> 
-        <#nested-opt-2> 
-        <#opt-filter-1> 
-        <#opt-filter-2> 
-        <#opt-filter-3> 
-        <#opt-filter-4> 
-        <#filter-place-1> 
-        <#filter-place-2> 
-        <#filter-place-3> 
-        <#filter-nested-1> 
-        <#filter-nested-2> 
-        <#filter-scope-1> 
-        <#join-scope-1> 
-    ) .
-
-
-<#nested-opt-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Nested Optionals - 1" ;
-         mf:action
-            [ qt:query  <two-nested-opt.rq> ;
-              qt:data   <two-nested-opt.ttl> ] ;
-         mf:result  <two-nested-opt.srx> .
-
-<#nested-opt-2> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Nested Optionals - 2" ;
-         mf:action
-            [ qt:query  <two-nested-opt-alt.rq> ;
-              qt:data   <two-nested-opt.ttl>  ] ;
-         mf:result  <two-nested-opt-alt.srx> .
-      
-
-<#opt-filter-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - 1" ;
-         mf:action
-            [ qt:query  <opt-filter-1.rq> ;
-              qt:data   <opt-filter-1.ttl>  ] ;
-         mf:result  <opt-filter-1.srx> .
-      
-
-<#opt-filter-2> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - 2 filters" ;
-         mf:action
-            [ qt:query  <opt-filter-2.rq> ;
-              qt:data   <opt-filter-2.ttl>  ] ;
-         mf:result  <opt-filter-2.srx> .
-
-<#opt-filter-3> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - scope of variable" ;
-         mf:action
-            [ qt:query  <opt-filter-3.rq> ;
-              qt:data   <opt-filter-3.ttl>  ] ;
-         mf:result  <opt-filter-3.srx> .
-
-## Extra test      
-<#opt-filter-4> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Optional-filter - scope with {{}}" ;
-         mf:action
-            [ qt:query  <opt-filter-4.rq> ;
-              qt:data   <opt-filter-4.ttl>  ] ;
-         mf:result  <opt-filter-4.srx> .
-      
-
-
-<#filter-place-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-placement - 1" ;
-         mf:action
-            [ qt:query  <filter-placement-1.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-         mf:result  <filter-placement-1.srx> .
-      
-
-<#filter-place-2> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-placement - 2" ;
-         mf:action
-            [ qt:query  <filter-placement-2.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-         mf:result  <filter-placement-2.srx> .
-      
-
-<#filter-place-3> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-placement - 3" ;
-         mf:action
-            [ qt:query  <filter-placement-3.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-         mf:result  <filter-placement-3.srx> .
-      
-
-<#filter-nested-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-nested - 1" ;
-         mf:action
-            [ qt:query  <filter-nested-1.rq> ;
-              qt:data   <data-1.ttl>  ] ;
-         mf:result  <filter-nested-1.srx> .
-      
-
-<#filter-nested-2> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-nested - 2" ;
-         mf:action
-            [ qt:query  <filter-nested-2.rq> ;
-              qt:data   <data-1.ttl>  ] ;
-         mf:result  <filter-nested-2.srx> .
-       
-
-<#filter-scope-1> rdf:type mf:QueryEvaluationTest ;
-         mf:name    "Filter-scope - 1" ;
-         mf:action
-            [ qt:query  <filter-scope-1.rq> ;
-              qt:data   <data-2.ttl>  ] ;
-         mf:result  <filter-scope-1.srx> .
-      
-
-<#join-scope-1> rdf:type mf:QueryEvaluationTest ;
-       mf:name      "Join scope - 1" ;
-       mf:action
-            [ qt:query  <var-scope-join-1.rq> ;
-              qt:data   <var-scope-join-1.ttl>  ] ;
-        mf:result  <var-scope-join-1.srx> .
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-1.rq b/jena-arq/testing/ARQ/Algebra/opt-filter-1.rq
deleted file mode 100644
index 4622dafe08..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-1.rq
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-  ?x :p ?v .
-  OPTIONAL
-  { 
-    ?y :q ?w .
-    FILTER(?v=2)
-  }
-}
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-1.srx b/jena-arq/testing/ARQ/Algebra/opt-filter-1.srx
deleted file mode 100644
index 60f05bca18..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-1.srx
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="x"/>
-    <variable name="v"/>
-    <variable name="y"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="y">
-        <uri>http://example/x3</uri>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="y">
-        <uri>http://example/x3</uri>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-1.ttl b/jena-arq/testing/ARQ/Algebra/opt-filter-1.ttl
deleted file mode 100644
index e27ee99cf5..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-1.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix   :         <http://example/> .
-
-:x1 :p 1 .
-:x2 :p 2 .
-
-:x3 :q 3 .
-:x3 :q 4 .
- 
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-2.rq b/jena-arq/testing/ARQ/Algebra/opt-filter-2.rq
deleted file mode 100644
index 82b136c81d..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-2.rq
+++ /dev/null
@@ -1,12 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-  ?x :p ?v .
-  OPTIONAL
-  { 
-    ?y :q ?w .
-    FILTER(?v=2)
-    FILTER(?w=3)
-  }
-}
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-2.srx b/jena-arq/testing/ARQ/Algebra/opt-filter-2.srx
deleted file mode 100644
index 42e9b6e4d7..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-2.srx
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="x"/>
-    <variable name="v"/>
-    <variable name="y"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="y">
-        <uri>http://example/x3</uri>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-2.ttl b/jena-arq/testing/ARQ/Algebra/opt-filter-2.ttl
deleted file mode 100644
index e27ee99cf5..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-2.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix   :         <http://example/> .
-
-:x1 :p 1 .
-:x2 :p 2 .
-
-:x3 :q 3 .
-:x3 :q 4 .
- 
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-3.rq b/jena-arq/testing/ARQ/Algebra/opt-filter-3.rq
deleted file mode 100644
index 9031586f98..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-3.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-    :x :p ?v . 
-    { :x :q ?w 
-      # ?v is not in scope so ?v2 never set
-      OPTIONAL {  :x :p ?v2 FILTER(?v = 1) }
-    }
-}
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-3.srx b/jena-arq/testing/ARQ/Algebra/opt-filter-3.srx
deleted file mode 100644
index e0d780f022..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-3.srx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-    <variable name="w"/>
-    <variable name="v2"/>
-  </head>
-  <results>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-3.ttl b/jena-arq/testing/ARQ/Algebra/opt-filter-3.ttl
deleted file mode 100644
index e27ee99cf5..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-3.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix   :         <http://example/> .
-
-:x1 :p 1 .
-:x2 :p 2 .
-
-:x3 :q 3 .
-:x3 :q 4 .
- 
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-4.rq b/jena-arq/testing/ARQ/Algebra/opt-filter-4.rq
deleted file mode 100644
index ebc829ef44..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-4.rq
+++ /dev/null
@@ -1,13 +0,0 @@
-PREFIX  dc: <http://purl.org/dc/elements/1.1/>
-PREFIX  x: <http://example.org/ns#>
-SELECT  ?title ?price
-WHERE
-    { ?book dc:title ?title .
-      OPTIONAL
-        {
-          {
-            ?book x:price ?price .
-            FILTER (?title = "TITLE 2") .
-          }
-        } .
-    }
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-4.srx b/jena-arq/testing/ARQ/Algebra/opt-filter-4.srx
deleted file mode 100644
index 780072181a..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-4.srx
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="title"/>
-    <variable name="price"/>
-  </head>
-  <results>
-    <result>
-      <binding name="title">
-        <literal>TITLE 3</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="title">
-        <literal>TITLE 2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="title">
-        <literal>TITLE 1</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/opt-filter-4.ttl b/jena-arq/testing/ARQ/Algebra/opt-filter-4.ttl
deleted file mode 100644
index b79212edd6..0000000000
--- a/jena-arq/testing/ARQ/Algebra/opt-filter-4.ttl
+++ /dev/null
@@ -1,12 +0,0 @@
-@prefix x: <http://example.org/ns#> .
-@prefix : <http://example.org/books#> .
-@prefix dc:         <http://purl.org/dc/elements/1.1/> .
-@prefix xsd:        <http://www.w3.org/2001/XMLSchema#> .
-
-:book1 dc:title "TITLE 1" .
-:book1 x:price  "10"^^xsd:integer .
-
-:book2 dc:title "TITLE 2" .
-:book2 x:price  "20"^^xsd:integer .
-
-:book3 dc:title "TITLE 3" .
diff --git a/jena-arq/testing/ARQ/Algebra/two-nested-opt-alt.rq b/jena-arq/testing/ARQ/Algebra/two-nested-opt-alt.rq
deleted file mode 100644
index 3c6820debb..0000000000
--- a/jena-arq/testing/ARQ/Algebra/two-nested-opt-alt.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX :    <http://example/>
-
-## The nested optional example, rewritten to a form that is the same
-## for the SPARQL algebra and the declarative semantics.
-SELECT *
-{ 
-    :x1 :p ?v .
-    OPTIONAL { :x3 :q ?w }
-    OPTIONAL { :x3 :q ?w  . :x2 :p ?v }
-}
diff --git a/jena-arq/testing/ARQ/Algebra/two-nested-opt-alt.srx b/jena-arq/testing/ARQ/Algebra/two-nested-opt-alt.srx
deleted file mode 100644
index 0644ba5b84..0000000000
--- a/jena-arq/testing/ARQ/Algebra/two-nested-opt-alt.srx
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="w">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/two-nested-opt.rq b/jena-arq/testing/ARQ/Algebra/two-nested-opt.rq
deleted file mode 100644
index 71b40469df..0000000000
--- a/jena-arq/testing/ARQ/Algebra/two-nested-opt.rq
+++ /dev/null
@@ -1,11 +0,0 @@
-PREFIX :    <http://example/>
-
-SELECT *
-{ 
-    :x1 :p ?v .
-    OPTIONAL
-    {
-      :x3 :q ?w .
-      OPTIONAL { :x2 :p ?v }
-    }
-}
diff --git a/jena-arq/testing/ARQ/Algebra/two-nested-opt.srx b/jena-arq/testing/ARQ/Algebra/two-nested-opt.srx
deleted file mode 100644
index 5b948dbfa2..0000000000
--- a/jena-arq/testing/ARQ/Algebra/two-nested-opt.srx
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="v"/>
-    <variable name="w"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/two-nested-opt.ttl b/jena-arq/testing/ARQ/Algebra/two-nested-opt.ttl
deleted file mode 100644
index 99ab730d1f..0000000000
--- a/jena-arq/testing/ARQ/Algebra/two-nested-opt.ttl
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix   :         <http://example/> .
-
-:x1 :p 1 .
-:x2 :p 2 .
-:x3 :q 3 .
-:x3 :q 4 .
diff --git a/jena-arq/testing/ARQ/Algebra/var-scope-join-1.rq b/jena-arq/testing/ARQ/Algebra/var-scope-join-1.rq
deleted file mode 100644
index fa856a4da0..0000000000
--- a/jena-arq/testing/ARQ/Algebra/var-scope-join-1.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example/>
-
-SELECT *
-{ 
-  ?X  :name "paul"
-  {?Y :name "george" . OPTIONAL { ?X :email ?Z } }
-}
-
diff --git a/jena-arq/testing/ARQ/Algebra/var-scope-join-1.srx b/jena-arq/testing/ARQ/Algebra/var-scope-join-1.srx
deleted file mode 100644
index 81d0717097..0000000000
--- a/jena-arq/testing/ARQ/Algebra/var-scope-join-1.srx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="X"/>
-    <variable name="Y"/>
-    <variable name="Z"/>
-  </head>
-  <results>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Algebra/var-scope-join-1.ttl b/jena-arq/testing/ARQ/Algebra/var-scope-join-1.ttl
deleted file mode 100644
index b6ee6e5d42..0000000000
--- a/jena-arq/testing/ARQ/Algebra/var-scope-join-1.ttl
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix : <http://example/> .
-
-_:B1 :name "paul" .
-_:B1 :phone "777-3426". 
-
-_:B2 :name "john" . 
-_:B2 :email <ma...@acd.edu> .
-
-_:B3 :name "george". 
-_:B3 :webPage <http://www.george.edu/> .
-
-_:B4 :name "ringo". 
-_:B4 :email <ma...@acd.edu> .
-_:B4 :webPage <http://www.starr.edu/> .
-_:B4 :phone "888-4537".
diff --git a/jena-arq/testing/ARQ/Ask/ask-1.rq b/jena-arq/testing/ARQ/Ask/ask-1.rq
deleted file mode 100644
index 25f63cbe66..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-1.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p 1 }
diff --git a/jena-arq/testing/ARQ/Ask/ask-1.srx b/jena-arq/testing/ARQ/Ask/ask-1.srx
deleted file mode 100644
index 35d0d119a4..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-1.srx
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-  </head>
-  <boolean>true</boolean>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Ask/ask-2.rq b/jena-arq/testing/ARQ/Ask/ask-2.rq
deleted file mode 100644
index 25f63cbe66..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-2.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p 1 }
diff --git a/jena-arq/testing/ARQ/Ask/ask-2.srj b/jena-arq/testing/ARQ/Ask/ask-2.srj
deleted file mode 100644
index e69b4fab57..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-2.srj
+++ /dev/null
@@ -1 +0,0 @@
-{"head":{},"boolean":true}
diff --git a/jena-arq/testing/ARQ/Ask/ask-3.rq b/jena-arq/testing/ARQ/Ask/ask-3.rq
deleted file mode 100644
index 25f63cbe66..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-3.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p 1 }
diff --git a/jena-arq/testing/ARQ/Ask/ask-3.ttl b/jena-arq/testing/ARQ/Ask/ask-3.ttl
deleted file mode 100644
index e9a290162e..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-3.ttl
+++ /dev/null
@@ -1,7 +0,0 @@
-@prefix :        <#> .
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:boolean    "true"^^xsd:boolean .
diff --git a/jena-arq/testing/ARQ/Ask/ask-4.rq b/jena-arq/testing/ARQ/Ask/ask-4.rq
deleted file mode 100644
index 3b56286cc2..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-4.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p 99 }
diff --git a/jena-arq/testing/ARQ/Ask/ask-4.srx b/jena-arq/testing/ARQ/Ask/ask-4.srx
deleted file mode 100644
index 8eea9e39a6..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-4.srx
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-  </head>
-  <boolean>false</boolean>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Ask/ask-5.rq b/jena-arq/testing/ARQ/Ask/ask-5.rq
deleted file mode 100644
index 3b56286cc2..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-5.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p 99 }
diff --git a/jena-arq/testing/ARQ/Ask/ask-5.srj b/jena-arq/testing/ARQ/Ask/ask-5.srj
deleted file mode 100644
index 34e759434e..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-5.srj
+++ /dev/null
@@ -1 +0,0 @@
-{"head":{},"boolean":false}
diff --git a/jena-arq/testing/ARQ/Ask/ask-6.rq b/jena-arq/testing/ARQ/Ask/ask-6.rq
deleted file mode 100644
index 3b56286cc2..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-6.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p 99 }
diff --git a/jena-arq/testing/ARQ/Ask/ask-6.ttl b/jena-arq/testing/ARQ/Ask/ask-6.ttl
deleted file mode 100644
index f444bdb6b6..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-6.ttl
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:boolean    "false"^^xsd:boolean .
diff --git a/jena-arq/testing/ARQ/Ask/ask-7.rq b/jena-arq/testing/ARQ/Ask/ask-7.rq
deleted file mode 100644
index 4bb6df2e08..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-7.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :p ?x }
diff --git a/jena-arq/testing/ARQ/Ask/ask-7.srx b/jena-arq/testing/ARQ/Ask/ask-7.srx
deleted file mode 100644
index 35d0d119a4..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-7.srx
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-  </head>
-  <boolean>true</boolean>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Ask/ask-8.rq b/jena-arq/testing/ARQ/Ask/ask-8.rq
deleted file mode 100644
index b4038a3808..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-8.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example/>
-
-ASK { :x :q ?x }
diff --git a/jena-arq/testing/ARQ/Ask/ask-8.srx b/jena-arq/testing/ARQ/Ask/ask-8.srx
deleted file mode 100644
index 8eea9e39a6..0000000000
--- a/jena-arq/testing/ARQ/Ask/ask-8.srx
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-  </head>
-  <boolean>false</boolean>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Ask/data.ttl b/jena-arq/testing/ARQ/Ask/data.ttl
deleted file mode 100644
index 0e3c666ab8..0000000000
--- a/jena-arq/testing/ARQ/Ask/data.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-@prefix :   <http://example/> .
-
-:x :p 1 .
diff --git a/jena-arq/testing/ARQ/Ask/manifest.ttl b/jena-arq/testing/ARQ/Ask/manifest.ttl
deleted file mode 100644
index 7a19b8ddf1..0000000000
--- a/jena-arq/testing/ARQ/Ask/manifest.ttl
+++ /dev/null
@@ -1,73 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "ASK" ;
-    mf:entries
-    ( 
-      [  mf:name    "ASK-1" ;
-         mf:action
-            [ qt:query  <ask-1.rq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <ask-1.srx>
-      ]
-      [  mf:name    "ASK-2" ;
-         mf:action
-            [ qt:query  <ask-2.rq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <ask-2.srj>
-      ]
-      [  mf:name    "ASK-3" ;
-         mf:action
-            [ qt:query  <ask-3.rq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <ask-3.ttl>
-      ]
-      [  mf:name    "ASK-4" ;
-         mf:action
-            [ qt:query  <ask-4.rq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <ask-4.srx>
-      ]
-      [  mf:name    "ASK-5" ;
-         mf:action
-            [ qt:query  <ask-5.rq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <ask-5.srj>
-      ]
-      [  mf:name    "ASK-6" ;
-         mf:action
-            [ qt:query  <ask-6.rq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <ask-6.ttl>
-      ]
-      [  mf:name    "ASK-7" ;
-         mf:action
-            [ qt:query  <ask-7.rq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <ask-7.srx>
-      ]
-      [  mf:name    "ASK-8" ;
-         mf:action
-            [ qt:query  <ask-8.rq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <ask-8.srx>
-      ]
-    ).
diff --git a/jena-arq/testing/ARQ/Assign/assign-01.arq b/jena-arq/testing/ARQ/Assign/assign-01.arq
deleted file mode 100644
index 76e74f060d..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-01.arq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT ?v ?v1
-{
-  ?x a :X .
-  ?x :p ?v
-  LET ( ?v1 := ?v+9 )
-}
diff --git a/jena-arq/testing/ARQ/Assign/assign-01.srx b/jena-arq/testing/ARQ/Assign/assign-01.srx
deleted file mode 100644
index 61609e7043..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-01.srx
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="v"/>
-    <variable name="v1"/>
-  </head>
-  <results>
-    <result>
-      <binding name="v">
-        <literal>2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal>a</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
-      </binding>
-      <binding name="v1">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">14</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="v1">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">13</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="v1">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">12</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="v1">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">11</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="v1">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">10</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Assign/assign-02.arq b/jena-arq/testing/ARQ/Assign/assign-02.arq
deleted file mode 100644
index 2ed5fc769c..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-02.arq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT *
-{
-  ?x a :X .
-  OPTIONAL { ?x :q ?v . LET ( ?marker := true ) }
-  FILTER (?marker)
-}
diff --git a/jena-arq/testing/ARQ/Assign/assign-02.srx b/jena-arq/testing/ARQ/Assign/assign-02.srx
deleted file mode 100644
index 32d9f7a300..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-02.srx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="x"/>
-    <variable name="v"/>
-    <variable name="marker"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x8</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">100</literal>
-      </binding>
-      <binding name="marker">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#boolean">true</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Assign/assign-03.arq b/jena-arq/testing/ARQ/Assign/assign-03.arq
deleted file mode 100644
index 53853cbffe..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-03.arq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT ?x
-{
-  ?x a :X .
-  OPTIONAL { ?x :q ?v . LET (?marker := true ) }
-  FILTER (! bound(?marker) )
-}
diff --git a/jena-arq/testing/ARQ/Assign/assign-03.srx b/jena-arq/testing/ARQ/Assign/assign-03.srx
deleted file mode 100644
index ef99ef4527..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-03.srx
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="x"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x7</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x6</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x5</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x4</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x3</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Assign/assign-04.arq b/jena-arq/testing/ARQ/Assign/assign-04.arq
deleted file mode 100644
index 585341fffe..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-04.arq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/> 
-
-CONSTRUCT  { ?x :more ?more }
-{
-  ?x :p ?v .
-  LET ( ?more := 100+?v )
-}
diff --git a/jena-arq/testing/ARQ/Assign/assign-04.ttl b/jena-arq/testing/ARQ/Assign/assign-04.ttl
deleted file mode 100644
index 620b33dcc6..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-04.ttl
+++ /dev/null
@@ -1,11 +0,0 @@
-@prefix :        <http://example/> .
-
-:x5   :more         105 .
-
-:x4   :more         104 .
-
-:x2   :more         102 .
-
-:x1   :more         101 .
-
-:x3   :more         103 .
diff --git a/jena-arq/testing/ARQ/Assign/assign-05.arq b/jena-arq/testing/ARQ/Assign/assign-05.arq
deleted file mode 100644
index fa61213cff..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-05.arq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT *
-{
-  ?x :p ?v .
-  LET ( ?more := 100+?v )
-  LET ( ?more2 := 100+?more )
-}
diff --git a/jena-arq/testing/ARQ/Assign/assign-05.srx b/jena-arq/testing/ARQ/Assign/assign-05.srx
deleted file mode 100644
index 4c007e0814..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-05.srx
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="x"/>
-    <variable name="v"/>
-    <variable name="more"/>
-    <variable name="more2"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x7</uri>
-      </binding>
-      <binding name="v">
-        <literal>2</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x6</uri>
-      </binding>
-      <binding name="v">
-        <literal>a</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x5</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
-      </binding>
-      <binding name="more">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">105</literal>
-      </binding>
-      <binding name="more2">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">205</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x4</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="more">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">104</literal>
-      </binding>
-      <binding name="more2">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">204</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x3</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="more">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">103</literal>
-      </binding>
-      <binding name="more2">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">203</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="more">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">102</literal>
-      </binding>
-      <binding name="more2">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">202</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">1</literal>
-      </binding>
-      <binding name="more">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">101</literal>
-      </binding>
-      <binding name="more2">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">201</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Assign/assign-06.arq b/jena-arq/testing/ARQ/Assign/assign-06.arq
deleted file mode 100644
index 2b9795d1a5..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-06.arq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT *
-{
-  ?x :p ?v .
-  LET ( ?more := 100+?v )
-  LET ( ?more2 := 100+?more )
-  FILTER(?more2 > 203)
-}
diff --git a/jena-arq/testing/ARQ/Assign/assign-06.srx b/jena-arq/testing/ARQ/Assign/assign-06.srx
deleted file mode 100644
index 8f3db739f9..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-06.srx
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="x"/>
-    <variable name="v"/>
-    <variable name="more"/>
-    <variable name="more2"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x5</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">5</literal>
-      </binding>
-      <binding name="more">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">105</literal>
-      </binding>
-      <binding name="more2">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">205</literal>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x4</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">4</literal>
-      </binding>
-      <binding name="more">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">104</literal>
-      </binding>
-      <binding name="more2">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">204</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Assign/assign-07.arq b/jena-arq/testing/ARQ/Assign/assign-07.arq
deleted file mode 100644
index 63c92af2f0..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-07.arq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT *
-{
-  ?x :p ?v .
-  LET ( ?more := 100+?v )
-  FILTER(?more2 > 203)  # ?more2 is unbound at this point.  So no answers.
-  LET ( ?more2 := 100+?more )
-}
diff --git a/jena-arq/testing/ARQ/Assign/assign-07.srx b/jena-arq/testing/ARQ/Assign/assign-07.srx
deleted file mode 100644
index 6ac71f0af2..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-07.srx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="x"/>
-    <variable name="v"/>
-    <variable name="more"/>
-    <variable name="more2"/>
-  </head>
-  <results>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Assign/assign-08.arq b/jena-arq/testing/ARQ/Assign/assign-08.arq
deleted file mode 100644
index f195b4064c..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-08.arq
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT *
-{
-  ?x :n ?v .
-    # Assign once.
-  LET ( ?y := 6-?v )
-     # Already set in many cases.
-   LET ( ?v := ?y )
-}
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Assign/assign-08.srx b/jena-arq/testing/ARQ/Assign/assign-08.srx
deleted file mode 100644
index 4276018c74..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-08.srx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="x"/>
-    <variable name="v"/>
-    <variable name="y"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x3</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-      <binding name="y">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">3</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Assign/assign-09.arq b/jena-arq/testing/ARQ/Assign/assign-09.arq
deleted file mode 100644
index 2f2dcdd87c..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-09.arq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX : <http://example/> 
-
-SELECT *
-{
-  ?x :n ?v .
-    # Assign once.
-  LET ( ?y := ?v )
-  LET ( ?y := 4-?v )
-}
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Assign/assign-09.srx b/jena-arq/testing/ARQ/Assign/assign-09.srx
deleted file mode 100644
index be55d1ae50..0000000000
--- a/jena-arq/testing/ARQ/Assign/assign-09.srx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<sparql xmlns="http://www.w3.org/2005/sparql-results#">
-  <head>
-    <variable name="x"/>
-    <variable name="v"/>
-    <variable name="y"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-      <binding name="v">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-      <binding name="y">
-        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">2</literal>
-      </binding>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Assign/data.ttl b/jena-arq/testing/ARQ/Assign/data.ttl
deleted file mode 100644
index 633cb12395..0000000000
--- a/jena-arq/testing/ARQ/Assign/data.ttl
+++ /dev/null
@@ -1,30 +0,0 @@
-@prefix : <http://example/> .
-
-:x1 a :X ;
-    :p 1 ;
-    :n 1 .
-
-:x2 a :X ;
-    :p 2 ;
-    :n 2 .
-
-:x3 a :X ;
-    :p 3 ;
-    :n 3 .
-
-:x4 a :X ;
-    :p 4 ;
-    :n 4 .
-
-:x5 a :X ;
-    :p 5 ;
-    :n 5 .
-
-:x6 a :X ;
-    :p "a" .
-
-:x7 a :X ;
-    :p "2" .
-
-:x8 a :X ;
-    :q 100 .
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Assign/manifest.ttl b/jena-arq/testing/ARQ/Assign/manifest.ttl
deleted file mode 100644
index 6991300a69..0000000000
--- a/jena-arq/testing/ARQ/Assign/manifest.ttl
+++ /dev/null
@@ -1,89 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix mfx:    <http://jena.hpl.hp.com/2005/05/test-manifest-extra#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "Assignment" ;
-    mf:entries
-    ( 
-      [ mf:name    "Assign 1" ;
-        rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <assign-01.arq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <assign-01.srx>
-      ]
-      [ mf:name    "Assign 2" ;
-        rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <assign-02.arq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <assign-02.srx>
-      ]
-     [ mf:name    "Assign 3" ;
-        rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <assign-03.arq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <assign-03.srx>
-      ]
-      [ mf:name    "Assign 4" ;
-        rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <assign-04.arq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <assign-04.ttl>
-      ]
-      [ mf:name    "Assign 5" ;
-        rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <assign-05.arq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <assign-05.srx>
-      ]
-      [ mf:name    "Assign 6" ;
-        rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <assign-06.arq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <assign-06.srx>
-      ]
-##       [ mf:name    "Assign 7" ;
-##         rdf:type   mfx:TestQuery ; 
-##          mf:action
-##             [ qt:query  <assign-07.arq> ;
-##               qt:data   <data.ttl> ] ;
-##         mf:result  <assign-07.srx>
-##       ]
-      [ mf:name    "Assign 8" ;
-        rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <assign-08.arq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <assign-08.srx>
-      ]
-      [ mf:name    "Assign 9" ;
-        rdf:type   mfx:TestQuery ; 
-         mf:action
-            [ qt:query  <assign-09.arq> ;
-              qt:data   <data.ttl> ] ;
-        mf:result  <assign-09.srx>
-      ]
-    ).
diff --git a/jena-arq/testing/ARQ/Basic/data-1.ttl b/jena-arq/testing/ARQ/Basic/data-1.ttl
deleted file mode 100644
index bfe253e154..0000000000
--- a/jena-arq/testing/ARQ/Basic/data-1.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix ns: <http://example.org/ns#> .
-@prefix x:  <http://example.org/x/> .
-@prefix z:  <http://example.org/x/#> .
-
-x:x ns:p  "d:x ns:p" .
-x:x x:p   "x:x x:p" .
-
-z:x z:p   "z:x z:p" .
diff --git a/jena-arq/testing/ARQ/Basic/manifest.ttl b/jena-arq/testing/ARQ/Basic/manifest.ttl
deleted file mode 100644
index 7156ff91d6..0000000000
--- a/jena-arq/testing/ARQ/Basic/manifest.ttl
+++ /dev/null
@@ -1,60 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "Basic test cases" ;
-    mf:entries
-    ( 
-      [ rdf:type mf:QueryEvaluationTest ;
-        mf:name    "Prefix/Base 1" ;
-        mf:action
-            [ qt:query  <q-base-prefix-1.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <r-base-prefix-1.ttl>
-      ]
-      [ rdf:type mf:QueryEvaluationTest ;
-        mf:name    "Prefix/Base 2" ;
-        mf:action
-            [ qt:query  <q-base-prefix-2.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <r-base-prefix-2.ttl>
-      ]
-      [ rdf:type mf:QueryEvaluationTest ;
-        mf:name    "Prefix/Base 3" ;
-        mf:action
-            [ qt:query  <q-base-prefix-3.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <r-base-prefix-3.ttl>
-      ]
-      [ rdf:type mf:QueryEvaluationTest ;
-        mf:name    "Prefix/Base 4" ;
-        mf:action
-            [ qt:query  <q-base-prefix-4.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <r-base-prefix-4.ttl>
-      ]
-      [ rdf:type mf:QueryEvaluationTest ;
-        mf:name    "Prefix/Base 5" ;
-        mf:action
-            [ qt:query  <q-base-prefix-5.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <r-base-prefix-5.ttl>
-      ]
-    ).
diff --git a/jena-arq/testing/ARQ/Basic/q-base-prefix-1.rq b/jena-arq/testing/ARQ/Basic/q-base-prefix-1.rq
deleted file mode 100644
index 4adf184f64..0000000000
--- a/jena-arq/testing/ARQ/Basic/q-base-prefix-1.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-BASE <http://example.org/x/> 
-PREFIX : <>
-
-SELECT * WHERE { :x ?p ?v } 
diff --git a/jena-arq/testing/ARQ/Basic/q-base-prefix-2.rq b/jena-arq/testing/ARQ/Basic/q-base-prefix-2.rq
deleted file mode 100644
index 824f2cb9fe..0000000000
--- a/jena-arq/testing/ARQ/Basic/q-base-prefix-2.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-BASE <http://example.org/x/> 
-PREFIX : <#>
-
-SELECT * WHERE { :x ?p ?v } 
diff --git a/jena-arq/testing/ARQ/Basic/q-base-prefix-3.rq b/jena-arq/testing/ARQ/Basic/q-base-prefix-3.rq
deleted file mode 100644
index 73e134d0d1..0000000000
--- a/jena-arq/testing/ARQ/Basic/q-base-prefix-3.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX ns: <http://example.org/ns#>
-PREFIX x:  <http://example.org/x/>
-
-SELECT * WHERE { x:x ns:p ?v } 
diff --git a/jena-arq/testing/ARQ/Basic/q-base-prefix-4.rq b/jena-arq/testing/ARQ/Basic/q-base-prefix-4.rq
deleted file mode 100644
index 7630599472..0000000000
--- a/jena-arq/testing/ARQ/Basic/q-base-prefix-4.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-BASE <http://example.org/x/>
-
-SELECT * WHERE { <x> <p> ?v } 
diff --git a/jena-arq/testing/ARQ/Basic/q-base-prefix-5.rq b/jena-arq/testing/ARQ/Basic/q-base-prefix-5.rq
deleted file mode 100644
index 010e755606..0000000000
--- a/jena-arq/testing/ARQ/Basic/q-base-prefix-5.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-BASE <http://example.org/x/>
-
-SELECT * WHERE { <#x> <#p> ?v } 
diff --git a/jena-arq/testing/ARQ/Basic/r-base-prefix-1.ttl b/jena-arq/testing/ARQ/Basic/r-base-prefix-1.ttl
deleted file mode 100644
index d8feb83bec..0000000000
--- a/jena-arq/testing/ARQ/Basic/r-base-prefix-1.ttl
+++ /dev/null
@@ -1,21 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/x/> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "p" ;
-      rs:resultVariable  "v" ;
-      rs:solution   [ rs:binding    [ rs:value      "x:x x:p" ;
-                                      rs:variable   "v"
-                                    ] ;
-                      rs:binding    [ rs:value      :p ;
-                                      rs:variable   "p"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <http://example.org/ns#p> ;
-                                      rs:variable   "p"
-                                    ] ;
-                      rs:binding    [ rs:value      "d:x ns:p" ;
-                                      rs:variable   "v"
-                                    ]
-                    ] .
diff --git a/jena-arq/testing/ARQ/Basic/r-base-prefix-2.ttl b/jena-arq/testing/ARQ/Basic/r-base-prefix-2.ttl
deleted file mode 100644
index 89a67500f6..0000000000
--- a/jena-arq/testing/ARQ/Basic/r-base-prefix-2.ttl
+++ /dev/null
@@ -1,14 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/x/#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "p" ;
-      rs:resultVariable  "v" ;
-      rs:solution   [ rs:binding    [ rs:value      :p ;
-                                      rs:variable   "p"
-                                    ] ;
-                      rs:binding    [ rs:value      "z:x z:p" ;
-                                      rs:variable   "v"
-                                    ]
-                    ] .
diff --git a/jena-arq/testing/ARQ/Basic/r-base-prefix-3.ttl b/jena-arq/testing/ARQ/Basic/r-base-prefix-3.ttl
deleted file mode 100644
index fd2c0807a7..0000000000
--- a/jena-arq/testing/ARQ/Basic/r-base-prefix-3.ttl
+++ /dev/null
@@ -1,12 +0,0 @@
-@prefix ns:      <http://example.org/ns#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix x:       <http://example.org/x/> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "v" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "d:x ns:p" ;
-                                  rs:variable  "v"
-                                ]
-                  ] .
diff --git a/jena-arq/testing/ARQ/Basic/r-base-prefix-4.ttl b/jena-arq/testing/ARQ/Basic/r-base-prefix-4.ttl
deleted file mode 100644
index 3f4efbf531..0000000000
--- a/jena-arq/testing/ARQ/Basic/r-base-prefix-4.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "v" ;
-      rs:solution   [ rs:binding    [ rs:value      "x:x x:p" ;
-                                      rs:variable   "v"
-                                    ]
-                    ] .
diff --git a/jena-arq/testing/ARQ/Basic/r-base-prefix-5.ttl b/jena-arq/testing/ARQ/Basic/r-base-prefix-5.ttl
deleted file mode 100644
index 4e6b88e4ee..0000000000
--- a/jena-arq/testing/ARQ/Basic/r-base-prefix-5.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "v" ;
-      rs:solution   [ rs:binding    [ rs:value      "z:x z:p" ;
-                                      rs:variable   "v"
-                                    ]
-                    ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/manifest.ttl b/jena-arq/testing/ARQ/BasicPatterns/manifest.ttl
deleted file mode 100644
index 61f559d2cc..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/manifest.ttl
+++ /dev/null
@@ -1,435 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<> rdf:type    mf:Manifest ;
-   rdfs:label  "Basic Patterns" ;
-   mf:entries
-      (
-# Dump data to check it.
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-0" ; 
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model0.nt> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-1" ; 
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model1.nt> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-2" ; 
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model2.nt> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-3" ;
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model3.nt> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-4" ; 
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model4.nt> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-5" ;
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model5.nt> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-6" ;
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model6.nt> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-7" ;
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model7.nt> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-8" ;
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model8.n3> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-9" ;
-  mf:action [ qt:query <query-dump.rq> ; qt:data <model9.n3> ] ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "query-dump-A" ;
-  mf:action [ qt:query <query-dump.rq> ; qt:data <modelA.nt> ] ]
-
-
-# Syntax
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-S-01.rq" ;
-  mf:action [ qt:query <test-S-01.rq> ; qt:data <modelA.nt> ] ;
-  mf:result <result-S-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-S-02.rq" ;
-  mf:action [ qt:query <test-S-02.rq> ; qt:data <modelA.nt> ] ;
-  mf:result <result-S-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-S-03.rq" ;
-  mf:action [ qt:query <test-S-03.rq> ; qt:data <modelA.nt> ] ;
-  mf:result <result-S-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-S-04.rq" ;
-  mf:action [ qt:query <test-S-04.rq> ; qt:data <modelA.nt> ] ;
-  mf:result <result-S-04.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-S-05.rq" ;
-  mf:action [ qt:query <test-S-05.rq> ; qt:data <modelA.nt> ] ;
-  mf:result <result-S-05.n3> ]
-
-
-# 
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-0-01.rq" ;
-  mf:action [ qt:query <test-0-01.rq> ; qt:data <model0.nt> ] ;
-  mf:result <result-0-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-0-02.rq" ;
-  mf:action [ qt:query <test-0-02.rq> ; qt:data <model0.nt> ] ;
-  mf:result <result-0-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-0-03.rq" ;
-  mf:action [ qt:query <test-0-03.rq> ; qt:data <model0.nt> ] ;
-  mf:result <result-0-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-0-04.rq" ;
-  mf:action [ qt:query <test-0-04.rq> ; qt:data <model0.nt> ] ;
-  mf:result <result-0-04.n3> ]
-
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-01.rq" ;
-  mf:action [ qt:query <test-1-01.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-1-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-02.rq" ;
-  mf:action [ qt:query <test-1-02.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-1-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-03.rq" ;
-  mf:action [ qt:query <test-1-03.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-1-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-04.rq" ;
-  mf:action [ qt:query <test-1-04.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-1-04.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-05.rq" ;
-  mf:action [ qt:query <test-1-05.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-1-05.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-06.rq" ;
-  mf:action [ qt:query <test-1-06.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-1-06.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-07.rq" ;
-  mf:action [ qt:query <test-1-07.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-1-07.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-08.rq" ;
-  mf:action [ qt:query <test-1-08.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-1-08.n3> ]
-
-
-## Removed : violates qname rules in SPARQL
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-09.rq" ;
-##   mf:action [ qt:query <test-1-09.rq> ; qt:data <model1.nt> ] ;
-##   mf:result <result-1-09.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-1-10.rq" ;
-  mf:action [ qt:query <test-1-10.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-1-10.n3> ]
-
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-01.rq" ;
-  mf:action [ qt:query <test-2-01.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-02.rq" ;
-  mf:action [ qt:query <test-2-02.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-03.rq" ;
-  mf:action [ qt:query <test-2-03.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-04.rq" ;
-  mf:action [ qt:query <test-2-04.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-04.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-05.rq" ;
-  mf:action [ qt:query <test-2-05.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-05.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-06.rq" ;
-  mf:action [ qt:query <test-2-06.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-06.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-07.rq" ;
-  mf:action [ qt:query <test-2-07.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-07.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-08.rq" ;
-  mf:action [ qt:query <test-2-08.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-08.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-09.rq" ;
-  mf:action [ qt:query <test-2-09.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-09.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-2-10.rq" ;
-  mf:action [ qt:query <test-2-10.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-2-10.n3> ]
-
-
-## Testing URIs with eq : insert a str()
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-3-01.rq" ;
-  mf:action [ qt:query <test-3-01.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-3-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-3-02.rq" ;
-  mf:action [ qt:query <test-3-02.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-3-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-3-03.rq" ;
-  mf:action [ qt:query <test-3-03.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-3-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-3-04.rq" ;
-  mf:action [ qt:query <test-3-04.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-3-04.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-3-05.rq" ;
-  mf:action [ qt:query <test-3-05.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-3-05.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-3-06.rq" ;
-  mf:action [ qt:query <test-3-06.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-3-06.n3> ]
-
-##
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-3-07.rq" ;
-  mf:action [ qt:query <test-3-07.rq> ; qt:data <model5.nt> ] ;
-  mf:result <result-3-07.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-4-01.rq" ;
-  mf:action [ qt:query <test-4-01.rq> ; qt:data <model2.nt> ] ;
-  mf:result <result-4-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-4-02.rq" ;
-  mf:action [ qt:query <test-4-02.rq> ; qt:data <model2.nt> ] ;
-  mf:result <result-4-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-4-03.rq" ;
-  mf:action [ qt:query <test-4-03.rq> ; qt:data <model2.nt> ] ;
-  mf:result <result-4-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-4-04.rq" ;
-  mf:action [ qt:query <test-4-04.rq> ; qt:data <model2.nt> ] ;
-  mf:result <result-4-04.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-4-05.rq" ;
-  mf:action [ qt:query <test-4-05.rq> ; qt:data <model3.nt> ] ;
-  mf:result <result-4-05.n3> ]
-
-
-# Tests bNodes
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-4-06.rq" ;
-##   mf:action [ qt:query <test-4-06.rq> ; qt:data <model3.nt> ] ;
-##   mf:result <result-4-06.n3> ]
-
-## String compare of a var with a URI value
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-4-07.rq" ;
-  mf:action [ qt:query <test-4-07.rq> ; qt:data <model3.nt> ] ;
-  mf:result <result-4-07.n3> ]
-
-## --
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-5-01.rq" ;
-  mf:action [ qt:query <test-5-01.rq> ; qt:data <model4.nt> ] ;
-  mf:result <result-5-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-5-02.rq" ;
-  mf:action [ qt:query <test-5-02.rq> ; qt:data <model4.nt> ] ;
-  mf:result <result-5-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-5-03.rq" ;
-  mf:action [ qt:query <test-5-03.rq> ; qt:data <model4.nt> ] ;
-  mf:result <result-5-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-5-04.rq" ;
-  mf:action [ qt:query <test-5-04.rq> ; qt:data <model4.nt> ] ;
-  mf:result <result-5-04.n3> ]
-
-## --
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-6-01.rq" ;
-  mf:action [ qt:query <test-6-01.rq> ; qt:data <model4.nt> ] ;
-  mf:result <result-6-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-6-02.rq" ;
-  mf:action [ qt:query <test-6-02.rq> ; qt:data <model4.nt> ] ;
-  mf:result <result-6-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-6-03.rq" ;
-  mf:action [ qt:query <test-6-03.rq> ; qt:data <model4.nt> ] ;
-  mf:result <result-6-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-6-04.rq" ;
-  mf:action [ qt:query <test-6-04.rq> ; qt:data <model4.nt> ] ;
-  mf:result <result-6-04.n3> ]
-
-## --
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-7-01.rq" ;
-  mf:action [ qt:query <test-7-01.rq> ; qt:data <model6.nt> ] ;
-  mf:result <result-7-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-7-02.rq" ;
-  mf:action [ qt:query <test-7-02.rq> ; qt:data <model6.nt> ] ;
-  mf:result <result-7-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-7-03.rq" ;
-  mf:action [ qt:query <test-7-03.rq> ; qt:data <model7.nt> ] ;
-  mf:result <result-7-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-7-04.rq" ;
-  mf:action [ qt:query <test-7-04.rq> ; qt:data <model7.nt> ] ;
-  mf:result <result-7-04.n3> ]
-
-
-## Testing URIs with =~ (needs str added)
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-8-01.rq" ;
-##   mf:action [ qt:query <test-8-01.rq> ; qt:data <model1.nt> ] ;
-##   mf:result <result-8-01.n3> ]
-## 
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-8-02.rq" ;
-##   mf:action [ qt:query <test-8-02.rq> ; qt:data <model1.nt> ] ;
-##   mf:result <result-8-02.n3> ]
-## 
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-8-03.rq" ;
-##   mf:action [ qt:query <test-8-03.rq> ; qt:data <model1.nt> ] ;
-##   mf:result <result-8-03.n3> ]
-## 
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-8-04.rq" ;
-##   mf:action [ qt:query <test-8-04.rq> ; qt:data <model1.nt> ] ;
-##   mf:result <result-8-04.n3> ]
-## 
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-8-05.rq" ;
-##   mf:action [ qt:query <test-8-05.rq> ; qt:data <model1.nt> ] ;
-##   mf:result <result-8-05.n3> ]
-
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-9-01.rq" ;
-  mf:action [ qt:query <test-9-01.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-9-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-9-02.rq" ;
-  mf:action [ qt:query <test-9-02.rq> ; qt:data <model1.nt> ] ;
-  mf:result <result-9-02.n3> ]
-
-
-## Testing URIs with eq
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-A-01.rq" ;
-##   mf:action [ qt:query <test-A-01.rq> ; qt:data <model5.nt> ] ;
-##   mf:result <result-A-01.n3> ]
-
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-A-02.rq" ;
-##   mf:action [ qt:query <test-A-02.rq> ; qt:data <model5.nt> ] ;
-##   mf:result <result-A-02.n3> ]
-
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-01.rq" ;
-  mf:action [ qt:query <test-B-01.rq> ; qt:data <model8.n3> ] ;
-  mf:result <result-B-01.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-02.rq" ;
-  mf:action [ qt:query <test-B-02.rq> ; qt:data <model8.n3> ] ;
-  mf:result <result-B-02.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-03.rq" ;
-  mf:action [ qt:query <test-B-03.rq> ; qt:data <model8.n3> ] ;
-  mf:result <result-B-03.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-04.rq" ;
-  mf:action [ qt:query <test-B-04.rq> ; qt:data <model8.n3> ] ;
-  mf:result <result-B-04.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-05.rq" ;
-  mf:action [ qt:query <test-B-05.rq> ; qt:data <model8.n3> ] ;
-  mf:result <result-B-05.n3> ]
-
-
-## Unknown type ; datatype test
-##[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-06.rq" ;
-##   mf:action [ qt:query <test-B-06.rq> ; qt:data <model8.n3> ] ;
-##   mf:result <result-B-06.n3> ]
-
-
-## Pointless
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-07.rq" ;
-##   mf:action [ qt:query <test-B-07.rq> ; qt:data <model9.n3> ] ;
-##   mf:result <result-B-07.n3> ]
-
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-08.rq" ;
-  mf:action [ qt:query <test-B-08.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-08.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-09.rq" ;
-  mf:action [ qt:query <test-B-09.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-09.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-10.rq" ;
-  mf:action [ qt:query <test-B-10.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-10.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-11.rq" ;
-  mf:action [ qt:query <test-B-11.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-11.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-12.rq" ;
-  mf:action [ qt:query <test-B-12.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-12.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-13.rq" ;
-  mf:action [ qt:query <test-B-13.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-13.n3> ]
-
-
-## Duplicate of test 13 - deleted
-## [ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-14.rq" ; mf:action <test-B-14.rq> ; mf:result <result-B-14.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-15.rq" ;
-  mf:action [ qt:query <test-B-15.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-15.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-16.rq" ;
-  mf:action [ qt:query <test-B-16.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-16.n3> ]
-
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-17.rq" ;
-  mf:action [ qt:query <test-B-17.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-17.n3> ]
-
-
-## Keywork "true"
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-18.rq" ;
-  mf:action [ qt:query <test-B-18.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-18.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-19.rq" ;
-  mf:action [ qt:query <test-B-19.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-19.n3> ]
-
-[ rdf:type mf:QueryEvaluationTest ; mf:name "test-B-20.rq" ;
-  mf:action [ qt:query <test-B-20.rq> ; qt:data <model9.n3> ] ;
-  mf:result <result-B-20.n3> ]
-
-    ) .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model0.nt b/jena-arq/testing/ARQ/BasicPatterns/model0.nt
deleted file mode 100644
index 120417acd2..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model0.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Model 0 : one statement
-<urn:xyz:abc>  <http://localhost/p1>   "/*Not a comment*/" .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model1.nt b/jena-arq/testing/ARQ/BasicPatterns/model1.nt
deleted file mode 100644
index 57faf505d6..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model1.nt
+++ /dev/null
@@ -1,5 +0,0 @@
-# Model 1 : Two resources ; two properties ; values encode the statement
-<http://rdf.hp.com/r-1>  <http://rdf.hp.com/p-1>  "v-1-1" .
-<http://rdf.hp.com/r-1>  <http://rdf.hp.com/p-2>  "v-1-2" .
-<http://rdf.hp.com/r-2>  <http://rdf.hp.com/p-1>  "v-2-1" .
-<http://rdf.hp.com/r-2>  <http://rdf.hp.com/p-2>  "v-2-2" .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model2.nt b/jena-arq/testing/ARQ/BasicPatterns/model2.nt
deleted file mode 100644
index 824ccaf48c..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model2.nt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Model 2 : Paths
-
-# A path
-
-<http://rdf.hp.com/s1>  <http://rdf.hp.com/p>  <http://rdf.hp.com/s2> .
-<http://rdf.hp.com/s2>  <http://rdf.hp.com/p>  "Value" .
-
-
-# A loop /one node
-
-<http://rdf.hp.com/r>  <http://rdf.hp.com/p>  <http://rdf.hp.com/r>.
-
-# A loop : two nodes
-
-<http://rdf.hp.com/r-1>  <http://rdf.hp.com/p-r-1-2>  <http://rdf.hp.com/r-2> .
-<http://rdf.hp.com/r-2>  <http://rdf.hp.com/p-r-2-1>  <http://rdf.hp.com/r-1> .
-
-# Two dangling arcs, same property
-<http://rdf.hp.com/r-2>  <http://rdf.hp.com/p-r-2-3>  <http://rdf.hp.com/r-3a> .
-<http://rdf.hp.com/r-2>  <http://rdf.hp.com/p-r-2-3>  <http://rdf.hp.com/r-3b> .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model3.nt b/jena-arq/testing/ARQ/BasicPatterns/model3.nt
deleted file mode 100644
index 9ae4db5cff..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model3.nt
+++ /dev/null
@@ -1,6 +0,0 @@
-# Anonymous nodes
-
-_:a <http://rdf.hp.com/p1> "v-a-1".
-_:a <http://rdf.hp.com/p2> "v-a-2".
-
-_:b <http://rdf.hp.com/p> _:a .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model4.nt b/jena-arq/testing/ARQ/BasicPatterns/model4.nt
deleted file mode 100644
index 243341aee9..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model4.nt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Model 4 : Strange shapes
-
-# Resource and property the same URI
-<http://rdf.hp.com/uri1>  <http://rdf.hp.com/uri1>  "R==P" .
-
-# Property and value
-<http://rdf.hp.com/uri-r>  <http://rdf.hp.com/uri-p>    <http://rdf.hp.com/uri-p>.
-
-# Resource and value has been done in model2.
-
-# All the same!
-<http://rdf.hp.com/uri1>  <http://rdf.hp.com/uri1>  <http://rdf.hp.com/uri1> .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model5.nt b/jena-arq/testing/ARQ/BasicPatterns/model5.nt
deleted file mode 100644
index c134a19e7f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model5.nt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Produced by ARP : see model5.rdf
-# This has two bags (one anon) in it.
-_:j1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#_1> "11" .
-_:j1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#_2> "12" .
-_:j1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag> .
-<http://never/something> <http://never/contents1> _:j1 .
-<http://never/bag> <http://www.w3.org/1999/02/22-rdf-syntax-ns#_1> "21" .
-<http://never/bag> <http://www.w3.org/1999/02/22-rdf-syntax-ns#_2> "22" .
-<http://never/bag> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Bag> .
-<http://never/something> <http://never/contents2> <http://never/bag> .
-<http://never/something> <http://never/otherstuff> "Other Stuff" .
-<http://never/somethingElse> <http://never/metadata> "metadata" .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model5.rdf b/jena-arq/testing/ARQ/BasicPatterns/model5.rdf
deleted file mode 100644
index 863cdc47ee..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model5.rdf
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0'?>
-<!-- Written with RDF/XML-ABBREV -->
-
-<rdf:RDF
-    xmlns:RDFNsId1='http://never/'
-    xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
-    xmlns:s='http://never/'>
-
-    <rdf:Description rdf:about="http://never/something">
-	<s:contents1>
-	    <rdf:Bag>
-		<rdf:li>11</rdf:li>
-		<rdf:li>12</rdf:li>
-	    </rdf:Bag>
-	</s:contents1>
-	<s:contents2>
-	    <rdf:Bag rdf:about="http://never/bag">
-		<rdf:li>21</rdf:li>
-		<rdf:li>22</rdf:li>
-	    </rdf:Bag>
-	</s:contents2>
-	<s:otherstuff>Other Stuff</s:otherstuff>
-    </rdf:Description>
-
-    <rdf:Description rdf:about="http://never/somethingElse">
-	<s:metadata>metadata</s:metadata>
-    </rdf:Description>
-	
-</rdf:RDF>
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model6.nt b/jena-arq/testing/ARQ/BasicPatterns/model6.nt
deleted file mode 100644
index 25e02c41ad..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model6.nt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Predicate URI also in subject slot
-<http://rdf.hp.com/r1>  <http://rdf.hp.com/r2>  "r-1-2" .
-<http://rdf.hp.com/r2>  <http://rdf.hp.com/r1>  "r-2-1" .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model7.nt b/jena-arq/testing/ARQ/BasicPatterns/model7.nt
deleted file mode 100644
index 319a69d3a4..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model7.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-_:a                     <http://rdf.hp.com/p>   "p" .
- <http://rdf.hp.com/p>  <http://rdf.hp.com/p>   "p" .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model8.n3 b/jena-arq/testing/ARQ/BasicPatterns/model8.n3
deleted file mode 100644
index c8a965bca2..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model8.n3
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix :     <http://rdf.hp.com/> .
-@prefix xsd:  <http://www.w3.org/2001/XMLSchema#> . 
-@prefix ns:   <http://rdf.hp.com/ns#> .
-
-:r :p1 "value"^^xsd:string .
-:r :p2 "value"^^ns:someType .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/model9.n3 b/jena-arq/testing/ARQ/BasicPatterns/model9.n3
deleted file mode 100644
index b85a411606..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/model9.n3
+++ /dev/null
@@ -1,17 +0,0 @@
-@prefix :     <http://rdf.hp.com/> .
-@prefix xsd:  <http://www.w3.org/2001/XMLSchema#> . 
-@prefix ns:   <http://rdf.hp.com/ns#> .
-@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-:r :p1 "value"^^ns:someType .
-:r :p2 "value"@en .
-:r :p2 "value"@zz .
-:r :p3 "value" .
-:r :p4 5 . # Same as "5"^^xsd:integer
-
-# Turtle does not have doubles.
-:r :p5 "5.7e0"^^xsd:double . # Must be exact lexical form
-:r :p6 "true"^^xsd:boolean .
-:r :p7 "true" .
-:r :p8 "value"^^rdf:XMLLiteral .
-
diff --git a/jena-arq/testing/ARQ/BasicPatterns/modelA.nt b/jena-arq/testing/ARQ/BasicPatterns/modelA.nt
deleted file mode 100644
index 9f1fae5da2..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/modelA.nt
+++ /dev/null
@@ -1,2 +0,0 @@
-<http://rdf.hp.com/r> <http://rdf.hp.com/p1> "value-\u00E9" .
-<http://rdf.hp.com/r-\u00E9> <http://rdf.hp.com/p1> "value" .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/query-dump.rq b/jena-arq/testing/ARQ/BasicPatterns/query-dump.rq
deleted file mode 100644
index a986098d44..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/query-dump.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  ?x ?y ?z
-WHERE
-{ ?x ?y ?z }
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-0-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-0-01.n3
deleted file mode 100644
index 84c4f5b2b1..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-0-01.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <urn:xyz:abc> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://localhost/p1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "/*Not a comment*/" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-0-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-0-02.n3
deleted file mode 100644
index 84f6047c83..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-0-02.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://localhost/p1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "/*Not a comment*/" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-0-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-0-03.n3
deleted file mode 100644
index fea9ce2231..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-0-03.n3
+++ /dev/null
@@ -1,12 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "select" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "select" ; rs:value "/*Not a comment*/" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-0-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-0-04.n3
deleted file mode 100644
index 84c4f5b2b1..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-0-04.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <urn:xyz:abc> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://localhost/p1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "/*Not a comment*/" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-01.n3
deleted file mode 100644
index 263f43d2f0..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-01.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-02.n3
deleted file mode 100644
index 3751307184..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-02.n3
+++ /dev/null
@@ -1,22 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-2" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-03.n3
deleted file mode 100644
index 7e9945ae79..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-03.n3
+++ /dev/null
@@ -1,22 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-04.n3
deleted file mode 100644
index 93adb7ec21..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-04.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-05.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-05.n3
deleted file mode 100644
index 1f40b02439..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-05.n3
+++ /dev/null
@@ -1,12 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-06.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-06.n3
deleted file mode 100644
index 41208e0d44..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-06.n3
+++ /dev/null
@@ -1,12 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "y" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-07.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-07.n3
deleted file mode 100644
index a806b401b3..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-07.n3
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  a   rs:ResultSet ;
-    rs:solution [] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-08.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-08.n3
deleted file mode 100644
index 87034365f7..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-08.n3
+++ /dev/null
@@ -1,7 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "y" ;
-
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-09.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-09.n3
deleted file mode 100644
index bdb210750b..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-09.n3
+++ /dev/null
@@ -1,12 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "y" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-1-10.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-1-10.n3
deleted file mode 100644
index a6fe4bb903..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-1-10.n3
+++ /dev/null
@@ -1,11 +0,0 @@
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]  a   rs:ResultSet ;
-    rs:resultVariable "x", "v" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ;
-          rs:binding [ rdf:type rs:ResultBinding ; rs:variable "v" ; rs:value "v-1-1"      ] ;
-        ] ;
-    .
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-01.n3
deleted file mode 100644
index 2acc1fd733..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-01.n3
+++ /dev/null
@@ -1,45 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-2" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-02.n3
deleted file mode 100644
index 01a4702708..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-02.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "a" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value "v-2-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value "v-1-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value "v-1-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value "v-2-2" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-03.n3
deleted file mode 100644
index 0328d5a3c7..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-03.n3
+++ /dev/null
@@ -1,115 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-    rs:resultVariable "a" ;
-    rs:resultVariable "b" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-2-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-2-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-1-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-1-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-1-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-1-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-2-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-2-2" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-04.n3
deleted file mode 100644
index 2166ea9f70..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-04.n3
+++ /dev/null
@@ -1,54 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-    rs:resultVariable "a" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-1> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-2> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-1> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p-2> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-05.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-05.n3
deleted file mode 100644
index 93adb7ec21..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-05.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-06.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-06.n3
deleted file mode 100644
index cde9f3ee98..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-06.n3
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-07.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-07.n3
deleted file mode 100644
index c6efc04e87..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-07.n3
+++ /dev/null
@@ -1,54 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z1" ;
-    rs:resultVariable "z2" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z1" ; rs:value "v-2-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z2" ; rs:value "v-2-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z1" ; rs:value "v-1-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z2" ; rs:value "v-1-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z1" ; rs:value "v-1-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z2" ; rs:value "v-1-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z1" ; rs:value "v-2-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z2" ; rs:value "v-2-2" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-08.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-08.n3
deleted file mode 100644
index f80bdc436f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-08.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-09.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-09.n3
deleted file mode 100644
index 93ceffa9fd..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-09.n3
+++ /dev/null
@@ -1,54 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-    rs:resultVariable "a" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value "v-2-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value "v-1-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value "v-1-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value "v-2-2" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-2-10.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-2-10.n3
deleted file mode 100644
index f80bdc436f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-2-10.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-3-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-3-01.n3
deleted file mode 100644
index 9b39f6c2ce..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-3-01.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-3-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-3-02.n3
deleted file mode 100644
index 248399f037..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-3-02.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-3-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-3-03.n3
deleted file mode 100644
index 7165f554e0..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-3-03.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-2" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-3-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-3-04.n3
deleted file mode 100644
index f80bdc436f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-3-04.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-3-05.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-3-05.n3
deleted file mode 100644
index f80bdc436f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-3-05.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-3-06.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-3-06.n3
deleted file mode 100644
index 1c182a936f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-3-06.n3
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-3-07.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-3-07.n3
deleted file mode 100644
index aef44ea5ff..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-3-07.n3
+++ /dev/null
@@ -1,36 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "b" ;
-    rs:resultVariable "y" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "11" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "12" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://never/bag> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "21" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://never/bag> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "22" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-4-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-4-01.n3
deleted file mode 100644
index e9932a27b5..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-4-01.n3
+++ /dev/null
@@ -1,89 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "a" ;
-    rs:resultVariable "b" ;
-    rs:resultVariable "z" ;
-    rs:resultVariable "c" ;
-    rs:resultVariable "d" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/s1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/s2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "c" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "d" ; rs:value "Value" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "c" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "d" ; rs:value <http://rdf.hp.com/r> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://rdf.hp.com/p-r-2-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "c" ; rs:value <http://rdf.hp.com/p-r-1-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "d" ; rs:value <http://rdf.hp.com/r-2> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://rdf.hp.com/p-r-1-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "c" ; rs:value <http://rdf.hp.com/p-r-2-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "d" ; rs:value <http://rdf.hp.com/r-1> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://rdf.hp.com/p-r-1-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "c" ; rs:value <http://rdf.hp.com/p-r-2-3> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "d" ; rs:value <http://rdf.hp.com/r-3a> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://rdf.hp.com/p-r-1-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "c" ; rs:value <http://rdf.hp.com/p-r-2-3> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "d" ; rs:value <http://rdf.hp.com/r-3b> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-4-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-4-02.n3
deleted file mode 100644
index 3ffd3f3012..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-4-02.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "a" ;
-    rs:resultVariable "z" ;
-    rs:resultVariable "d" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/s1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/s2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "d" ; rs:value "Value" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "d" ; rs:value <http://rdf.hp.com/r> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-4-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-4-03.n3
deleted file mode 100644
index e6707bb929..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-4-03.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "a" ;
-    rs:resultVariable "b" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/s1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://rdf.hp.com/p> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-4-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-4-04.n3
deleted file mode 100644
index f153d9dde1..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-4-04.n3
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "a" ;
-    rs:resultVariable "b" ;
-
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-4-05.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-4-05.n3
deleted file mode 100644
index 86d1768566..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-4-05.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "a" ;
-    rs:resultVariable "b" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-a-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "v-a-2" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-4-06.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-4-06.n3
deleted file mode 100644
index 11c27a5716..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-4-06.n3
+++ /dev/null
@@ -1,87 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "p1" ;
-    rs:resultVariable "v1" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "p2" ;
-    rs:resultVariable "v2" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p1" ; rs:value <http://rdf.hp.com/p2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v1" ; rs:value "v-a-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p2" ; rs:value <http://rdf.hp.com/p2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v2" ; rs:value "v-a-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p1" ; rs:value <http://rdf.hp.com/p2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v1" ; rs:value "v-a-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p2" ; rs:value <http://rdf.hp.com/p1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v2" ; rs:value "v-a-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p1" ; rs:value <http://rdf.hp.com/p1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v1" ; rs:value "v-a-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p2" ; rs:value <http://rdf.hp.com/p2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v2" ; rs:value "v-a-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p1" ; rs:value <http://rdf.hp.com/p1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v1" ; rs:value "v-a-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p2" ; rs:value <http://rdf.hp.com/p1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v2" ; rs:value "v-a-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value _:b2 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p1" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v1" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value _:b2 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "p2" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "v2" ; rs:value _:b1 ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-4-07.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-4-07.n3
deleted file mode 100644
index 5282440d8a..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-4-07.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value _:b1 ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-5-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-5-01.n3
deleted file mode 100644
index 74bb814206..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-5-01.n3
+++ /dev/null
@@ -1,22 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "R==P" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/uri1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-5-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-5-02.n3
deleted file mode 100644
index c0174aec1c..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-5-02.n3
+++ /dev/null
@@ -1,12 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-5-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-5-03.n3
deleted file mode 100644
index 47437172e9..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-5-03.n3
+++ /dev/null
@@ -1,22 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "z" ;
-    rs:resultVariable "x" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/uri1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/uri-r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri-p> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-5-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-5-04.n3
deleted file mode 100644
index 2090209a99..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-5-04.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/uri1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-6-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-6-01.n3
deleted file mode 100644
index 74bb814206..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-6-01.n3
+++ /dev/null
@@ -1,22 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "R==P" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/uri1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-6-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-6-02.n3
deleted file mode 100644
index c0174aec1c..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-6-02.n3
+++ /dev/null
@@ -1,12 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-6-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-6-03.n3
deleted file mode 100644
index 47437172e9..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-6-03.n3
+++ /dev/null
@@ -1,22 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "z" ;
-    rs:resultVariable "x" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/uri1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/uri-r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri-p> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-6-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-6-04.n3
deleted file mode 100644
index 2090209a99..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-6-04.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/uri1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value <http://rdf.hp.com/uri1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-7-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-7-01.n3
deleted file mode 100644
index 52b74a4bf7..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-7-01.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "a" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/r1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r2> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/r2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-7-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-7-02.n3
deleted file mode 100644
index 0a4a509822..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-7-02.n3
+++ /dev/null
@@ -1,37 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "a" ;
-    rs:resultVariable "b" ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/r2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "r-2-1" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "r-1-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/r1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/r2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value "r-1-2" ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "r-2-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-7-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-7-03.n3
deleted file mode 100644
index b39db956ec..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-7-03.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "a" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-7-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-7-04.n3
deleted file mode 100644
index b39db956ec..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-7-04.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "a" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p> ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "a" ; rs:value <http://rdf.hp.com/p> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-8-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-8-01.n3
deleted file mode 100644
index 9b39f6c2ce..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-8-01.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-2" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-8-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-8-02.n3
deleted file mode 100644
index cd16bad371..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-8-02.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-2" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-8-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-8-03.n3
deleted file mode 100644
index f80bdc436f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-8-03.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-8-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-8-04.n3
deleted file mode 100644
index 248399f037..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-8-04.n3
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-2> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-2-1" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-8-05.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-8-05.n3
deleted file mode 100644
index f80bdc436f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-8-05.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-9-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-9-01.n3
deleted file mode 100644
index f80bdc436f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-9-01.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-9-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-9-02.n3
deleted file mode 100644
index f80bdc436f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-9-02.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:resultVariable "z" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p-1> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "v-1-1" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-A-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-A-01.n3
deleted file mode 100644
index aef44ea5ff..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-A-01.n3
+++ /dev/null
@@ -1,36 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "b" ;
-    rs:resultVariable "y" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "11" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "12" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://never/bag> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "21" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://never/bag> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "22" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-A-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-A-02.n3
deleted file mode 100644
index aef44ea5ff..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-A-02.n3
+++ /dev/null
@@ -1,36 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "b" ;
-    rs:resultVariable "y" ;
-
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "11" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value _:b1 ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "12" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://never/bag> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "21" ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "b" ; rs:value <http://never/bag> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value "22" ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3
deleted file mode 100644
index cadd0992db..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_10.n3
+++ /dev/null
@@ -1,19 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:size "0" ;
-
-## Exact graph match - "string" != "string"^^xsd:string
-
-##     rs:size "1" ;
-##     rs:solution
-##         [ rdf:type rs:ResultSolution ; 
-##           rs:binding [ rdf:type rs:ResultBinding ;
-##                        rs:variable "x" ; rs:value <http://rdf.hp.com/r> ] ;
-##           rs:binding [ rdf:type rs:ResultBinding ;
-##                        rs:variable "y" ; rs:value <http://rdf.hp.com/p1> ] ;
-##         ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3
deleted file mode 100644
index df95b9efa0..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-01-RDF_11.n3
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-## RDF 1.-0 results.
-## [] rdf:type rs:ResultSet ;
-##     rs:resultVariable "x" ;
-##     rs:resultVariable "y" ;
-##     rs:size "0" ;
-
-## Exact graph match - "string" != "string"^^xsd:string
-
-## RDF 1.1
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:size "1" ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-01.n3
deleted file mode 100644
index df95b9efa0..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-01.n3
+++ /dev/null
@@ -1,24 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-## RDF 1.-0 results.
-## [] rdf:type rs:ResultSet ;
-##     rs:resultVariable "x" ;
-##     rs:resultVariable "y" ;
-##     rs:size "0" ;
-
-## Exact graph match - "string" != "string"^^xsd:string
-
-## RDF 1.1
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:size "1" ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-02.n3
deleted file mode 100644
index e34467b7c8..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-02.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:size "1" ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p2> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-03.n3
deleted file mode 100644
index 1cc5af9917..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-03.n3
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:size "0" ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-04.n3
deleted file mode 100644
index 7c01ee4248..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-04.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "x" ;
-    rs:resultVariable "y" ;
-    rs:size "1" ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "x" ; rs:value <http://rdf.hp.com/r> ] ;
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "y" ; rs:value <http://rdf.hp.com/p1> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-05.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-05.n3
deleted file mode 100644
index f3babd2398..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-05.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> . 
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[] rdf:type rs:ResultSet ;
-    rs:resultVariable "z" ;
-    rs:size "2" ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "value"^^xsd:string ] ;
-        ] ;
-    rs:solution
-        [ rdf:type rs:ResultSolution ; 
-          rs:binding [ rdf:type rs:ResultBinding ;
-                       rs:variable "z" ; rs:value "value"^^<http://rdf.hp.com/ns#someType> ] ;
-        ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-06.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-06.n3
deleted file mode 100644
index 267276917f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-06.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix log:    <http://www.w3.org/2000/10/swap/log#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :       <#> .
-
-[]  a   rs:ResultSet ;
-    rs:resultVariable     "z" ;
-    rs:size      "1" .
-    rs:solution
-        [ rs:binding
-              [ rs:value "value"^^<http://rdf.hp.com/ns#someType> ;
-                rs:variable "z" 
-              ]
-        ] ;
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-07.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-07.n3
deleted file mode 100644
index a1f62eacaf..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-07.n3
+++ /dev/null
@@ -1,106 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "z" ;
-      rs:resultVariable  "y" ;
-      rs:resultVariable  "x" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "true" ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p7> ;
-                                  rs:variable  "y"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "value"^^rdf:XMLLiteral ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p8> ;
-                                  rs:variable  "y"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "5.7"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p5> ;
-                                  rs:variable  "y"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    <http://rdf.hp.com/p1> ;
-                                  rs:variable  "y"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    "value"^^<http://rdf.hp.com/ns#someType> ;
-                                  rs:variable  "z"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    <http://rdf.hp.com/p4> ;
-                                  rs:variable  "y"
-                                ] ;
-                    rs:binding  [ rs:value    5 ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p6> ;
-                                  rs:variable  "y"
-                                ] ;
-                    rs:binding  [ rs:value    "true"^^<http://www.w3.org/2001/XMLSchema#boolean> ;
-                                  rs:variable  "z"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p2> ;
-                                  rs:variable  "y"
-                                ] ;
-                    rs:binding  [ rs:value    "value"@en ;
-                                  rs:variable  "z"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    <http://rdf.hp.com/p2> ;
-                                  rs:variable  "y"
-                                ] ;
-                    rs:binding  [ rs:value    "value"@zz ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    "value" ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p3> ;
-                                  rs:variable  "y"
-                                ]
-                  ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-08.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-08.n3
deleted file mode 100644
index 0cafee296b..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-08.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix log:    <http://www.w3.org/2000/10/swap/log#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :       <#> .
-
-[]  a   rs:ResultSet ;
-    rs:solution
-        [ rs:binding
-              [ rs:value     <http://rdf.hp.com/r> ;
-                rs:variable  "x" ] ;
-          rs:binding
-              [ rs:value     <http://rdf.hp.com/p2> ;
-                rs:variable  "y" ]
-         ] ;
-    rs:resultVariable   "x" ;
-    rs:resultVariable   "y" ;
-    rs:size             "1" .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-09.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-09.n3
deleted file mode 100644
index 5b8befa68b..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-09.n3
+++ /dev/null
@@ -1,21 +0,0 @@
-@prefix log:    <http://www.w3.org/2000/10/swap/log#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :       <#> .
-
-[]  a   rs:ResultSet ;
-    rs:resultVariable  "x" ;
-    rs:resultVariable  "y" ;
-    rs:solution
-        [ rs:binding
-              [ rs:value
-                    <http://rdf.hp.com/r> ;
-                rs:variable
-                    "x" ] ;
-          rs:binding
-              [ rs:value
-                    <http://rdf.hp.com/p1> ;
-                rs:variable
-                    "y" ] ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-10.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-10.n3
deleted file mode 100644
index a235598d38..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-10.n3
+++ /dev/null
@@ -1,22 +0,0 @@
-@prefix log:    <http://www.w3.org/2000/10/swap/log#> .
-@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
-
-@prefix rs:     <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :       <#> .
-
-[]  a   rs:ResultSet ;
-    rs:resultVariable    "x" ;
-    rs:resultVariable    "y" ;
-    rs:solution
-        [ rs:binding
-              [ rs:value
-                    <http://rdf.hp.com/r> ;
-                rs:variable
-                    "x" ] ;
-          rs:binding
-              [ rs:value
-                    <http://rdf.hp.com/p8> ;
-                rs:variable
-                    "y" ] ] ;
-    .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-11.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-11.n3
deleted file mode 100644
index 13d90c78b8..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-11.n3
+++ /dev/null
@@ -1,62 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "z" ;
-      rs:resultVariable  "y" ;
-      rs:resultVariable  "x" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "value"@en ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p2> ;
-                                  rs:variable  "y"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "value" ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p3> ;
-                                  rs:variable  "y"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "value"^^rdf:XMLLiteral ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p8> ;
-                                  rs:variable  "y"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    <http://rdf.hp.com/p2> ;
-                                  rs:variable  "y"
-                                ] ;
-                    rs:binding  [ rs:value    "value"@zz ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    "value"^^<http://rdf.hp.com/ns#someType> ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/p1> ;
-                                  rs:variable  "y"
-                                ]
-                  ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-12.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-12.n3
deleted file mode 100644
index d88fe94e5d..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-12.n3
+++ /dev/null
@@ -1,18 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "z" ;
-      rs:resultVariable  "y" ;
-      rs:resultVariable  "x" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    <http://rdf.hp.com/p2> ;
-                                  rs:variable  "y"
-                                ] ;
-                    rs:binding  [ rs:value    "value"@en ;
-                                  rs:variable  "z"
-                                ] ;
-                    rs:binding  [ rs:value    <http://rdf.hp.com/r> ;
-                                  rs:variable  "x"
-                                ]
-                  ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-13.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-13.n3
deleted file mode 100644
index 17aa7077be..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-13.n3
+++ /dev/null
@@ -1,14 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "y" , "x" ;
-      rs:solution
-              [ rs:binding
-                        [ rs:value <http://rdf.hp.com/p4> ;
-                          rs:variable "y"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/r> ;
-                          rs:variable "x"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-15.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-15.n3
deleted file mode 100644
index c7ce6e98e3..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-15.n3
+++ /dev/null
@@ -1,19 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "y" , "x" , "v" ;
-      rs:size "1" ;
-      rs:solution
-              [ rs:binding
-                        [ rs:value 5 ;
-                          rs:variable "v"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/r> ;
-                          rs:variable "x"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/p4> ;
-                          rs:variable "y"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-16.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-16.n3
deleted file mode 100644
index c7ce6e98e3..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-16.n3
+++ /dev/null
@@ -1,19 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "y" , "x" , "v" ;
-      rs:size "1" ;
-      rs:solution
-              [ rs:binding
-                        [ rs:value 5 ;
-                          rs:variable "v"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/r> ;
-                          rs:variable "x"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/p4> ;
-                          rs:variable "y"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-17.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-17.n3
deleted file mode 100644
index 3f80dacecb..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-17.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "y" , "x" ;
-      rs:size "1" ;
-      rs:solution
-              [ rs:binding
-                        [ rs:value <http://rdf.hp.com/p7> ;
-                          rs:variable "y"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/r> ;
-                          rs:variable "x"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-18.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-18.n3
deleted file mode 100644
index 1a0fafc713..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-18.n3
+++ /dev/null
@@ -1,20 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix xsd:    <http://www.w3.org/2001/XMLSchema#> . 
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "y" , "x" , "v" ;
-      rs:size "1" ;
-      rs:solution
-              [ rs:binding
-                        [ rs:value "true"^^xsd:boolean ;
-                          rs:variable "v"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/r> ;
-                          rs:variable "x"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/p6> ;
-                          rs:variable "y"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-19.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-19.n3
deleted file mode 100644
index 34d105aa96..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-19.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "y" , "x" ;
-      rs:size "1" ;
-      rs:solution
-              [ rs:binding
-                        [ rs:value <http://rdf.hp.com/r> ;
-                          rs:variable "x"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/p5> ;
-                          rs:variable "y"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-B-20.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-B-20.n3
deleted file mode 100644
index db99759821..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-B-20.n3
+++ /dev/null
@@ -1,20 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "y" , "x" , "v" ;
-      rs:size "1" ;
-      rs:solution
-              [ rs:binding
-                        [ rs:value "5.7e0"^^xsd:double ;
-                          rs:variable "v"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/p5> ;
-                          rs:variable "y"
-                        ] ;
-                rs:binding
-                        [ rs:value <http://rdf.hp.com/r> ;
-                          rs:variable "x"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-S-01.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-S-01.n3
deleted file mode 100644
index 6e6a3417cd..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-S-01.n3
+++ /dev/null
@@ -1,11 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "y" ;
-
-      rs:solution
-              [ rs:binding
-                        [ rs:value <http://rdf.hp.com/p1> ;
-                          rs:variable "y"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-S-02.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-S-02.n3
deleted file mode 100644
index 74d7ef7109..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-S-02.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "p" , "v" ;
-
-      rs:solution
-              [ rs:binding
-                        [ rs:value <http://rdf.hp.com/p1> ;
-                          rs:variable "p"
-                        ] ;
-                rs:binding
-                        [ rs:value "value-\u00E9" ;
-                          rs:variable "v"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-S-03.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-S-03.n3
deleted file mode 100644
index 99335989ec..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-S-03.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "p" , "v" ;
-
-      rs:solution
-              [ rs:binding
-                        [ rs:value <http://rdf.hp.com/p1> ;
-                          rs:variable "p"
-                        ] ;
-                rs:binding
-                        [ rs:value "value" ;
-                          rs:variable "v"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-S-04.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-S-04.n3
deleted file mode 100644
index 84defcad19..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-S-04.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "p" , "v" ;
-
-      rs:solution
-              [ rs:binding
-                        [ rs:value <http://rdf.hp.com/p1> ;
-                          rs:variable "p"
-                        ] ;
-                rs:binding
-                        [ rs:value "value-\u00e9" ;
-                          rs:variable "v"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/result-S-05.n3 b/jena-arq/testing/ARQ/BasicPatterns/result-S-05.n3
deleted file mode 100644
index 74d7ef7109..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/result-S-05.n3
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]    a       rs:ResultSet ;
-      rs:resultVariable "p" , "v" ;
-
-      rs:solution
-              [ rs:binding
-                        [ rs:value <http://rdf.hp.com/p1> ;
-                          rs:variable "p"
-                        ] ;
-                rs:binding
-                        [ rs:value "value-\u00E9" ;
-                          rs:variable "v"
-                        ]
-              ] .
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-0-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-0-01.rq
deleted file mode 100644
index 65cdf257d1..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-0-01.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-0-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-0-02.rq
deleted file mode 100644
index 05731843cc..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-0-02.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { <urn:xyz:abc> ?y ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-0-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-0-03.rq
deleted file mode 100644
index 316611eb8e..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-0-03.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  ?select
-WHERE
-    { ?x <http://localhost/p1> ?select }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-0-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-0-04.rq
deleted file mode 100644
index 65cdf257d1..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-0-04.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-01.rq
deleted file mode 100644
index 2194aa1b22..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-01.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  ?x
-WHERE
-    { ?x ?y ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-02.rq
deleted file mode 100644
index 1d6674832a..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-02.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { <http://rdf.hp.com/r-1> ?y ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-03.rq
deleted file mode 100644
index 453190625c..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-03.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x <http://rdf.hp.com/p-1> ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-04.rq
deleted file mode 100644
index 5b94372ea1..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-04.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y "v-1-1" }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-05.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-05.rq
deleted file mode 100644
index 2246d50026..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-05.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { <http://rdf.hp.com/r-1> <http://rdf.hp.com/p-1> ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-06.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-06.rq
deleted file mode 100644
index 5a365e5608..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-06.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { <http://rdf.hp.com/r-1> ?y "v-1-1" }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-07.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-07.rq
deleted file mode 100644
index 22c350e796..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-07.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { <http://rdf.hp.com/r-1> <http://rdf.hp.com/p-1> "v-1-1" }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-08.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-08.rq
deleted file mode 100644
index 4bfc591350..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-08.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { <http://rdf.hp.com/r-1> ?y "v-2-2" }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-09.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-09.rq
deleted file mode 100644
index 67aa1a78d4..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-09.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX  prefix: <http://rdf.hp.com>
-SELECT  *
-WHERE
-# ILLEGAL
-{ prefix:/r-1 ?y "v-1-2" }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-1-10.rq b/jena-arq/testing/ARQ/BasicPatterns/test-1-10.rq
deleted file mode 100644
index d86ae9a9b8..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-1-10.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  ?x ?v
-WHERE
-    { <http://rdf.hp.com/r-1> <http://rdf.hp.com/p-1> ?v }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-01.rq
deleted file mode 100644
index e1cebaedb9..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  ?x ?y ?z
-WHERE
-    { ?x ?y ?z .
-      ?x ?y ?z .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-02.rq
deleted file mode 100644
index a3320e95cb..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  ?a
-WHERE
-    { ?x ?y ?z .
-      ?x ?y ?a .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-03.rq
deleted file mode 100644
index de7d56a159..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-03.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z .
-      ?x ?a ?b .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-04.rq
deleted file mode 100644
index 092b970f49..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-04.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z .
-      ?x ?a ?z .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-05.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-05.rq
deleted file mode 100644
index 75e73c0d31..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-05.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y "v-1-1" .
-      ?x ?y "v-1-1" .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-06.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-06.rq
deleted file mode 100644
index a6b2a9e33d..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-06.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y "v-1-1" .
-      ?x ?y "v-1-2" .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-07.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-07.rq
deleted file mode 100644
index f6f4fabb8a..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-07.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z1 .
-      ?x ?y ?z2 . 
-      FILTER ( ?z1 = ?z2 ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-08.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-08.rq
deleted file mode 100644
index a366a76dec..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-08.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z .
-      ?x ?y "v-1-1" .
-      ?x ?y ?z .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-09.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-09.rq
deleted file mode 100644
index e918e6fef7..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-09.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z .
-      ?x ?y ?z .
-      ?x ?y ?a .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-2-10.rq b/jena-arq/testing/ARQ/BasicPatterns/test-2-10.rq
deleted file mode 100644
index 2f0e0e5dc1..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-2-10.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y "v-1-1" .
-      ?x ?y ?z .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-3-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-3-01.rq
deleted file mode 100644
index fd33a7cc45..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-3-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( str(?x) = str(<http://rdf.hp.com/r-1>) ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-3-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-3-02.rq
deleted file mode 100644
index e137873034..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-3-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( str(?y) = str(<http://rdf.hp.com/p-1>) ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-3-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-3-03.rq
deleted file mode 100644
index 734e40e759..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-3-03.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( str(?z) = "v-2-2" ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-3-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-3-04.rq
deleted file mode 100644
index 5be07b2e94..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-3-04.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( str(?x) = str(<http://rdf.hp.com/r-1>) ) . 
-      FILTER ( str(?y) = str(<http://rdf.hp.com/p-1>) ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-3-05.rq b/jena-arq/testing/ARQ/BasicPatterns/test-3-05.rq
deleted file mode 100644
index f95b0c2799..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-3-05.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( str(?x) = str(<http://rdf.hp.com/r-1>) ) . 
-      FILTER ( str(?y) = str(<http://rdf.hp.com/p-1>) ) . 
-      FILTER ( str(?z) = "v-1-1" ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-3-06.rq b/jena-arq/testing/ARQ/BasicPatterns/test-3-06.rq
deleted file mode 100644
index c88d6a66c6..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-3-06.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( str(?x) = str(<http://rdf.hp.com/r-1>) ) . 
-      FILTER ( str(?y) = str(<http://rdf.hp.com/p-1>) ) . 
-      FILTER ( str(?z) = str("v-2-1") ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-3-07.rq b/jena-arq/testing/ARQ/BasicPatterns/test-3-07.rq
deleted file mode 100644
index e6b9ed5cba..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-3-07.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  rsyn: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-SELECT  ?b ?y
-WHERE
-    { ?b rsyn:type rsyn:Bag .
-      ?b ?x ?y . 
-      FILTER ( ! ( ( str(?x) = str(rsyn:type) ) && ( str(?y) = str(rsyn:Bag) ) ) ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-4-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-4-01.rq
deleted file mode 100644
index ee39337d5c..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-4-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?a ?b ?z .
-      ?z ?c ?d .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-4-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-4-02.rq
deleted file mode 100644
index 0b0360f382..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-4-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?a <http://rdf.hp.com/p> ?z .
-      ?z <http://rdf.hp.com/p> ?d .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-4-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-4-03.rq
deleted file mode 100644
index d63c718459..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-4-03.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?a ?b <http://rdf.hp.com/s2> }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-4-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-4-04.rq
deleted file mode 100644
index 64b3e17f54..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-4-04.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?a ?b "http://rdf.hp.com/s2" }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-4-05.rq b/jena-arq/testing/ARQ/BasicPatterns/test-4-05.rq
deleted file mode 100644
index df49933b82..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-4-05.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  ?y ?a ?b
-WHERE
-    { ?x ?y ?z .
-      ?z ?a ?b .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-4-06.rq b/jena-arq/testing/ARQ/BasicPatterns/test-4-06.rq
deleted file mode 100644
index 632c163dc1..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-4-06.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?p1 ?v1 .
-      ?y ?p2 ?v2 . 
-      FILTER str(?x) = str(?y) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-4-07.rq b/jena-arq/testing/ARQ/BasicPatterns/test-4-07.rq
deleted file mode 100644
index 32bfbb5d55..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-4-07.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  ?x ?y
-WHERE
-    { ?x ?p1 "v-a-1" .
-      ?y ?p2 "v-a-2" .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-5-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-5-01.rq
deleted file mode 100644
index f5140ad2d8..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-5-01.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?x ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-5-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-5-02.rq
deleted file mode 100644
index 61c11c6495..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-5-02.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?x ?x }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-5-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-5-03.rq
deleted file mode 100644
index 60331abc92..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-5-03.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?z ?x ?x }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-5-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-5-04.rq
deleted file mode 100644
index df253355ce..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-5-04.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?z ?x }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-6-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-6-01.rq
deleted file mode 100644
index f5140ad2d8..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-6-01.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?x ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-6-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-6-02.rq
deleted file mode 100644
index 61c11c6495..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-6-02.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?x ?x }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-6-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-6-03.rq
deleted file mode 100644
index 60331abc92..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-6-03.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?z ?x ?x }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-6-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-6-04.rq
deleted file mode 100644
index df253355ce..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-6-04.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?z ?x }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-7-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-7-01.rq
deleted file mode 100644
index f4c007882a..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-7-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  ?x ?y ?a
-WHERE
-    { ?x ?y ?z .
-      ?y ?a ?b .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-7-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-7-02.rq
deleted file mode 100644
index b29105cf7a..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-7-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?y ?a ?b .
-      ?x ?y ?z .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-7-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-7-03.rq
deleted file mode 100644
index f4c007882a..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-7-03.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  ?x ?y ?a
-WHERE
-    { ?x ?y ?z .
-      ?y ?a ?b .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-7-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-7-04.rq
deleted file mode 100644
index d819fec86a..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-7-04.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  ?x ?y ?a
-WHERE
-    { ?y ?a ?b .
-      ?x ?y ?z .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-8-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-8-01.rq
deleted file mode 100644
index 470cf509db..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-8-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER REGEX(?x, "r-1$")
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-8-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-8-02.rq
deleted file mode 100644
index cdafd16fad..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-8-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ! REGEX(?x,"r-1$") .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-8-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-8-03.rq
deleted file mode 100644
index 110ab932bc..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-8-03.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  ?x ?y ?z
-WHERE
-    { ?x ?y ?z . 
-      FILTER !regex(?x, "r-1$") && !regex(?y, "p\-1$" ).
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-8-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-8-04.rq
deleted file mode 100644
index 9b03fae8ff..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-8-04.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER  !regex(?x, "//rdf.hp.COM/r", "i") && ! regex(?y,"1$" ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-8-05.rq b/jena-arq/testing/ARQ/BasicPatterns/test-8-05.rq
deleted file mode 100644
index bb6703a54b..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-8-05.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ?x = "http://rdf.hp.com/r-1" ) && !REGEX(?y,"1$" ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-9-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-9-01.rq
deleted file mode 100644
index a37fe7422b..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-9-01.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( ?z = "v-1-1" ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-9-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-9-02.rq
deleted file mode 100644
index a37fe7422b..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-9-02.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( ?z = "v-1-1" ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-A-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-A-01.rq
deleted file mode 100644
index d679d1b9e7..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-A-01.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX  rdfs: <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX  rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-SELECT  ?b ?y
-WHERE
-    { ?b rdf:type rdf:Bag .
-      ?b ?x ?y . 
-      FILTER ( ! ( ( ?x = rdf:type ) && ( ?y = rdf:Bag ) ) ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-A-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-A-02.rq
deleted file mode 100644
index e85949c595..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-A-02.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-SELECT  ?b ?y
-WITH <model5.nt>
-WHERE
-{
-    ( ?b rdf:type rdf:Bag )
-      ( ?b ?x ?y )
-      FILTER! ( ( ?x = rdf:type ) && ( ?y = rdf:Bag ) )
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-01.rq
deleted file mode 100644
index 8ec88c9250..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-01.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  ?x ?y
-WHERE
-    { ?x ?y "value" }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-02.rq
deleted file mode 100644
index dd9dfa8ee6..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-02.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX  ns: <http://rdf.hp.com/ns#>
-SELECT  ?x ?y
-WHERE
-    { ?x ?y "value"^^ns:someType }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-03.rq
deleted file mode 100644
index c1ff898309..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-03.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX  ex: <http://example.com/ns#>
-SELECT  ?x ?y
-WHERE
-    { ?x ?y "value"^^ex:someType }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-04.rq
deleted file mode 100644
index 394ba90497..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-04.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-
-SELECT  ?x ?y
-WHERE
-    { ?x ?y "value"^^xsd:string }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-05.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-05.rq
deleted file mode 100644
index f2bbd826c6..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-05.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  ?z
-WHERE
-    { ?x ?y ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-06.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-06.rq
deleted file mode 100644
index 981c4ebcca..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-06.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX  ns: <http://rdf.hp.com/ns#>
-SELECT  ?z
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( ( str(?z) = "value" ) && ( datatype(?z) = ns:someType ) ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-07.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-07.rq
deleted file mode 100644
index 65cdf257d1..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-07.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-08.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-08.rq
deleted file mode 100644
index e264796130..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-08.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y "value"@en }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-09.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-09.rq
deleted file mode 100644
index 4bd8fad1d4..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-09.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX  ns: <http://rdf.hp.com/ns#>
-SELECT  *
-WHERE
-    { ?x ?y "value"^^ns:someType }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-10.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-10.rq
deleted file mode 100644
index 6e456fbde7..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-10.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX  rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-SELECT  *
-WHERE
-    { ?x ?y "value"^^rdf:XMLLiteral }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-11.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-11.rq
deleted file mode 100644
index c77db2f568..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-11.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( str(?z) = str("value"@en) ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-12.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-12.rq
deleted file mode 100644
index ed6cd3d82a..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-12.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      FILTER ( ?z = "value"@en ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-13.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-13.rq
deleted file mode 100644
index 3c7cb7e8c6..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-13.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y 5 }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-15.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-15.rq
deleted file mode 100644
index d8c2e3b003..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-15.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?v . 
-      FILTER ( ?v = 5 ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-16.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-16.rq
deleted file mode 100644
index d8c2e3b003..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-16.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?v . 
-      FILTER ( ?v = 5 ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-17.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-17.rq
deleted file mode 100644
index b4a0c0b398..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-17.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y "true" }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-18.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-18.rq
deleted file mode 100644
index 7a76646643..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-18.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-SELECT  *
-WHERE
-{
-  ?x ?y ?v .
-  FILTER ( ?v = true )
-}
-
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-19.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-19.rq
deleted file mode 100644
index 3ce99cf598..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-19.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y 5.7e0 }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-B-20.rq b/jena-arq/testing/ARQ/BasicPatterns/test-B-20.rq
deleted file mode 100644
index 3d4d31e730..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-B-20.rq
+++ /dev/null
@@ -1,5 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?v . 
-      FILTER ( ?v = 5.7 ) .
-    }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-S-01.rq b/jena-arq/testing/ARQ/BasicPatterns/test-S-01.rq
deleted file mode 100644
index 835450099f..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-S-01.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX  x: <http://rdf.hp.com/>
-SELECT  ?y
-WHERE
-    { x:r ?y "value-é" }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-S-02.rq b/jena-arq/testing/ARQ/BasicPatterns/test-S-02.rq
deleted file mode 100644
index 841ae7acc6..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-S-02.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX  é: <http://rdf.hp.com/>
-SELECT  ?p ?v
-WHERE
-    { é:r ?p ?v }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-S-03.rq b/jena-arq/testing/ARQ/BasicPatterns/test-S-03.rq
deleted file mode 100644
index 180ecddd0a..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-S-03.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX  x: <http://rdf.hp.com/>
-SELECT  ?p ?v
-WHERE
-    { x:r-é ?p ?v }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-S-04.rq b/jena-arq/testing/ARQ/BasicPatterns/test-S-04.rq
deleted file mode 100644
index 841ae7acc6..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-S-04.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX  é: <http://rdf.hp.com/>
-SELECT  ?p ?v
-WHERE
-    { é:r ?p ?v }
diff --git a/jena-arq/testing/ARQ/BasicPatterns/test-S-05.rq b/jena-arq/testing/ARQ/BasicPatterns/test-S-05.rq
deleted file mode 100644
index 218cabdc84..0000000000
--- a/jena-arq/testing/ARQ/BasicPatterns/test-S-05.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX  α: <http://rdf.hp.com/>
-SELECT  ?p ?v
-WHERE
-    { α:r ?p ?v }
diff --git a/jena-arq/testing/ARQ/Bound/bound1-result.n3 b/jena-arq/testing/ARQ/Bound/bound1-result.n3
deleted file mode 100644
index 1ffd834cfd..0000000000
--- a/jena-arq/testing/ARQ/Bound/bound1-result.n3
+++ /dev/null
@@ -1,20 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable
-                "a" , "c" ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/ns#c2> ;
-                                rs:variable "a"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#f> ;
-                                rs:variable "c"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/ns#a2> ;
-                                rs:variable "a"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#c2> ;
-                                rs:variable "c"
-                              ]
-                ] .
diff --git a/jena-arq/testing/ARQ/Bound/bound1.rq b/jena-arq/testing/ARQ/Bound/bound1.rq
deleted file mode 100644
index b3d7f985ba..0000000000
--- a/jena-arq/testing/ARQ/Bound/bound1.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX  : <http://example.org/ns#>
-SELECT  ?a ?c
-WHERE
-    { ?a :b ?c . 
-      OPTIONAL
-        { ?c :d ?e } . 
-      FILTER (! bound(?e)) 
-    }
diff --git a/jena-arq/testing/ARQ/Bound/data.n3 b/jena-arq/testing/ARQ/Bound/data.n3
deleted file mode 100644
index 50eb82b7f6..0000000000
--- a/jena-arq/testing/ARQ/Bound/data.n3
+++ /dev/null
@@ -1,5 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:a1 :b :c1 . 
-:c1 :d :e . 
-:a2 :b :c2 .
-:c2 :b :f .
diff --git a/jena-arq/testing/ARQ/Bound/manifest.ttl b/jena-arq/testing/ARQ/Bound/manifest.ttl
deleted file mode 100644
index ce4d2ed621..0000000000
--- a/jena-arq/testing/ARQ/Bound/manifest.ttl
+++ /dev/null
@@ -1,34 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "Bound" ;
-    mf:entries
-    ([  mf:name    "dawg-bound-query-001" ;
-        rdfs:comment
-            "BOUND test case." ;
-        mf:action
-            [ qt:query  <bound1.rq> ;
-              qt:data   <data.n3> ] ;
-        mf:result  <bound1-result.n3>
-      ]
-
-    # End of tests
-   ).
diff --git a/jena-arq/testing/ARQ/Construct/data-1.ttl b/jena-arq/testing/ARQ/Construct/data-1.ttl
deleted file mode 100644
index 866af33505..0000000000
--- a/jena-arq/testing/ARQ/Construct/data-1.ttl
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix ns: <http://example.org/ns#> .
-@prefix :   <http://example.org/> .
-
-:bill ns:loves _:who .
-:joe  ns:loves _:who .
-
diff --git a/jena-arq/testing/ARQ/Construct/dft.ttl b/jena-arq/testing/ARQ/Construct/dft.ttl
deleted file mode 100644
index 078013e071..0000000000
--- a/jena-arq/testing/ARQ/Construct/dft.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:s :p :o .
diff --git a/jena-arq/testing/ARQ/Construct/g1.ttl b/jena-arq/testing/ARQ/Construct/g1.ttl
deleted file mode 100644
index 97ea06b820..0000000000
--- a/jena-arq/testing/ARQ/Construct/g1.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:s1 :p :o1 .
-:a1 :b1 :c1 .
diff --git a/jena-arq/testing/ARQ/Construct/g2.ttl b/jena-arq/testing/ARQ/Construct/g2.ttl
deleted file mode 100644
index 15bab83bec..0000000000
--- a/jena-arq/testing/ARQ/Construct/g2.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:s2 :p :o2 .
diff --git a/jena-arq/testing/ARQ/Construct/manifest.ttl b/jena-arq/testing/ARQ/Construct/manifest.ttl
deleted file mode 100644
index 7e9e6602e9..0000000000
--- a/jena-arq/testing/ARQ/Construct/manifest.ttl
+++ /dev/null
@@ -1,172 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "CONSTRUCT" ;
-    mf:entries
-    ( 
-     [  mf:name    "Construct 1" ;
-         mf:action
-            [ qt:query  <q-construct-1.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <results-construct-1.ttl>
-      ]
-
-     [  mf:name    "Construct 2" ;
-         mf:action
-            [ qt:query  <q-construct-2.rq> ;
-              qt:data   <data-1.ttl> ] ;
-        mf:result  <results-construct-2.ttl>
-      ]
-
-
-      [  mf:name    "Reification 1" ;
-         mf:action
-            [ qt:query  <q-reif-1.rq> ;
-              qt:data   <reif-data-1.ttl> ] ;
-        mf:result  <reif-result-1.rdf>
-      ]
-      [  mf:name    "Reification 2" ;
-         mf:action
-            [ qt:query  <q-reif-2.rq> ;
-              qt:data   <reif-data-2.ttl> ] ;
-        mf:result  <reif-result-2.rdf>
-      ]
-      [  mf:name    "Construct Quad: Named Graph" ;
-         mf:action
-            [ qt:query     <q-construct-quad-named-graph.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-named-graph.trig>
-      ]
-      [  mf:name    "Construct Quad: Default Graph 1" ;
-         mf:action
-            [ qt:query     <q-construct-quad-default-graph-1.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-default-graph.ttl>
-      ]
-      [  mf:name    "Construct Quad: Default Graph 2" ;
-         mf:action
-            [ qt:query     <q-construct-quad-default-graph-2.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-default-graph.ttl>
-      ]
-      [  mf:name    "Construct Quad: Dataset" ;
-         mf:action
-            [ qt:query     <q-construct-quad-dataset.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-dataset.trig>
-      ]
-      [  mf:name    "Construct Quad: Short Form 1" ;
-         mf:action
-            [ qt:query     <q-construct-quad-short-form-1.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-short-form-1.trig>
-      ]
-      [  mf:name    "Construct Quad: Short Form 2" ;
-         mf:action
-            [ qt:query     <q-construct-quad-short-form-2.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-short-form-2.ttl>
-      ]
-      [  mf:name    "Construct Quad: Short Form 3" ;
-         mf:action
-            [ qt:query     <q-construct-quad-short-form-3.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-short-form-3.trig>
-      ]
-      [  mf:name    "Construct Quad: Syntax 1" ;
-         mf:action
-            [ qt:query     <q-construct-quad-syntax-1.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-syntax-1.trig>
-      ]
-      [  mf:name    "Construct Quad: Syntax 2" ;
-         mf:action
-            [ qt:query     <q-construct-quad-syntax-2.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-syntax-2.trig>
-      ]
-      [  mf:name    "Construct Quad: Syntax 3" ;
-         mf:action
-            [ qt:query     <q-construct-quad-syntax-3.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-syntax-3.ttl>
-      ]
-      [  mf:name    "Construct Quad: Syntax 4" ;
-         mf:action
-            [ qt:query     <q-construct-quad-syntax-4.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-syntax-4.trig>
-      ]
-      [  mf:name    "Construct Quad: Syntax 5" ;
-         mf:action
-            [ qt:query     <q-construct-quad-syntax-5.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-syntax-5.trig>
-      ]
-      [  mf:name    "Construct Quad: Syntax 6" ;
-         mf:action
-            [ qt:query     <q-construct-quad-syntax-6.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-syntax-6.trig>
-      ]
-      [  mf:name    "Construct Quad: Syntax 7" ;
-         mf:action
-            [ qt:query     <q-construct-quad-syntax-7.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-syntax-7.ttl>
-      ]
-      [  mf:name    "Construct Quad: Syntax 7" ;
-         mf:action
-            [ qt:query     <q-construct-quad-syntax-7.arq> ;
-              qt:data      <dft.ttl> ;
-              qt:graphData <g1.ttl> ;
-              qt:graphData <g2.ttl> ] ;
-        mf:result  <results-construct-quad-syntax-7.ttl>
-      ]
-    ).
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-1.rq b/jena-arq/testing/ARQ/Construct/q-construct-1.rq
deleted file mode 100644
index fea33f65cd..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX ns: <http://example.org/ns#>
-PREFIX :   <http://example.org/>
-
-CONSTRUCT
-    { ?x ns:knows ?y  }
-WHERE
-    { ?x ns:loves ?y }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-2.rq b/jena-arq/testing/ARQ/Construct/q-construct-2.rq
deleted file mode 100644
index 18052adc8b..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-2.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX ns: <http://example.org/ns#>
-PREFIX :   <http://example.org/>
-
-# No match => empty graph
-CONSTRUCT
-    { ?x ns:knows ?y  }
-WHERE
-    { ?x ns:sameTown ?y }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-dataset.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-dataset.arq
deleted file mode 100644
index 9b5d8939dd..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-dataset.arq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT
-    { ?s :m ?o. GRAPH ?g { ?sg :m ?og  }  }
-WHERE
-    { ?s :p ?o. GRAPH ?g { ?sg :p ?og  }  }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-default-graph-1.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-default-graph-1.arq
deleted file mode 100644
index c348c063ad..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-default-graph-1.arq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT
-    {  ?s :m ?o  }
-WHERE
-    { GRAPH ?g { ?s :p ?o  }  }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-default-graph-2.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-default-graph-2.arq
deleted file mode 100644
index da4fe466e0..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-default-graph-2.arq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT
-    {  { ?s :m ?o } }
-WHERE
-    { GRAPH ?g { ?s :p ?o  }  }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-named-graph.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-named-graph.arq
deleted file mode 100644
index 7bebe3c5a7..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-named-graph.arq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT
-    { GRAPH ?g { ?s :m ?o  }  }
-WHERE
-    { GRAPH ?g { ?s :p ?o  }  }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-short-form-1.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-short-form-1.arq
deleted file mode 100644
index d1300d891c..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-short-form-1.arq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT
-WHERE
-    { GRAPH ?g { ?s :p ?o  }  }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-short-form-2.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-short-form-2.arq
deleted file mode 100644
index 68a45fd185..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-short-form-2.arq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT
-WHERE
-    { ?s :p ?o  }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-short-form-3.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-short-form-3.arq
deleted file mode 100644
index 97ef15cbc9..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-short-form-3.arq
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT
-WHERE
-    { ?s :p ?o. GRAPH ?g { ?sg :p ?og  }  }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-1.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-1.arq
deleted file mode 100644
index 32eb18965a..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-1.arq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT { GRAPH :g { :s :p :o } } WHERE {}
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-2.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-2.arq
deleted file mode 100644
index 340c047c21..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-2.arq
+++ /dev/null
@@ -1,3 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-CONSTRUCT { GRAPH ?g { ?s ?p ?o } } WHERE { ?s ?p ?o }
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-3.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-3.arq
deleted file mode 100644
index bef7c4f79d..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-3.arq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT { :s :p :o  } WHERE {}
-
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-4.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-4.arq
deleted file mode 100644
index 929b602f5e..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-4.arq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT {
-   GRAPH ?g { :s :p :o }
-   ?s ?p ?o
-   }
-WHERE
-   { GRAPH ?g { ?s ?p ?o } }
-
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-5.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-5.arq
deleted file mode 100644
index a9a8b61d34..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-5.arq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT {
-   ?s ?p ?o
-   GRAPH ?g { :s :p :o }
-   }
-WHERE
-   { GRAPH ?g { ?s ?p ?o } }
-
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-6.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-6.arq
deleted file mode 100644
index 921a44bdf5..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-6.arq
+++ /dev/null
@@ -1,14 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT {
-   GRAPH ?g { :s :p :o }
-   ?s ?p ?o .
-   ?s ?p ?o .
-   GRAPH ?g { ?s ?p ?o }
-   ?s ?p ?o .
-   ?s ?p ?o
-   GRAPH ?g { ?s ?p ?o }
-   }
-WHERE
-   { GRAPH ?g { ?s ?p ?o } }
-
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-7.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-7.arq
deleted file mode 100644
index fedde3c113..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-7.arq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT {
-   GRAPH <urn:x-arq:DefaultGraphNode> {:s :p :o .}
-   }
-WHERE {}
-
diff --git a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-8.arq b/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-8.arq
deleted file mode 100644
index b5c0b402e9..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-construct-quad-syntax-8.arq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX :   <http://example.org/ns#>
-
-CONSTRUCT {
-   GRAPH ?g { :s :p :o }
-   GRAPH ?g1 { :s :p :o }
-   }
-WHERE
-   { }
-
diff --git a/jena-arq/testing/ARQ/Construct/q-reif-1.rq b/jena-arq/testing/ARQ/Construct/q-reif-1.rq
deleted file mode 100644
index ca8f0ddb97..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-reif-1.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX  rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-CONSTRUCT 
-  { _:b0 rdf:subject ?s .
-    _:b0 rdf:predicate ?p .
-    _:b0 rdf:object ?o .
-  }
-WHERE
-  { ?s ?p ?o . }
diff --git a/jena-arq/testing/ARQ/Construct/q-reif-2.rq b/jena-arq/testing/ARQ/Construct/q-reif-2.rq
deleted file mode 100644
index 2c4eed9fb1..0000000000
--- a/jena-arq/testing/ARQ/Construct/q-reif-2.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX  rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-CONSTRUCT 
-  { ?s ?p ?o .
-  }
-WHERE
-  { _:b0 rdf:subject ?s .
-    _:b0 rdf:predicate ?p .
-    _:b0 rdf:object ?o .
-  }
diff --git a/jena-arq/testing/ARQ/Construct/reif-1.arq b/jena-arq/testing/ARQ/Construct/reif-1.arq
deleted file mode 100644
index 660882ecf3..0000000000
--- a/jena-arq/testing/ARQ/Construct/reif-1.arq
+++ /dev/null
@@ -1,5 +0,0 @@
-# A query to reifiy every triple in a graph
-# Prefix only to assist in formatting the output
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-CONSTRUCT { << ?s ?p ?o >> } WHERE { ?s ?p ?o }
diff --git a/jena-arq/testing/ARQ/Construct/reif-2.arq b/jena-arq/testing/ARQ/Construct/reif-2.arq
deleted file mode 100644
index 1d6cdfecf8..0000000000
--- a/jena-arq/testing/ARQ/Construct/reif-2.arq
+++ /dev/null
@@ -1,7 +0,0 @@
-# A query to "de-reifiy" a graph
-
-# Prefix only to assist in formatting the output
-PREFIX  rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-
-CONSTRUCT { ?s ?p ?o }
-WHERE { << ?s ?p ?o >> } 
diff --git a/jena-arq/testing/ARQ/Construct/reif-data-1.ttl b/jena-arq/testing/ARQ/Construct/reif-data-1.ttl
deleted file mode 100644
index f4120a39e0..0000000000
--- a/jena-arq/testing/ARQ/Construct/reif-data-1.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix data:  <http://example.org/data/> .
-@prefix ns:    <http://example.org/ns#> .
-@prefix rdf:        <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-data:x ns:p 1 .
-data:x ns:p 2 .
-
-data:y ns:q data:x .
-
diff --git a/jena-arq/testing/ARQ/Construct/reif-data-2.ttl b/jena-arq/testing/ARQ/Construct/reif-data-2.ttl
deleted file mode 100644
index c275c14843..0000000000
--- a/jena-arq/testing/ARQ/Construct/reif-data-2.ttl
+++ /dev/null
@@ -1,19 +0,0 @@
-@prefix data:    <http://example.org/data/> .
-@prefix ns:      <http://example.org/ns#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:object  2 ;
-      rdf:predicate  ns:p ;
-      rdf:subject  data:x .
-
-[]    rdf:object  (1) ;
-      rdf:predicate  ns:p ;
-      rdf:subject  data:x .
-
-#Not complete
-[]    rdf:object  data:x ;
-      rdf:subject  data:y .
-
-# Something different
-data:x  ns:p  data:z .
-
diff --git a/jena-arq/testing/ARQ/Construct/reif-result-1.rdf b/jena-arq/testing/ARQ/Construct/reif-result-1.rdf
deleted file mode 100644
index 8d221d26ee..0000000000
--- a/jena-arq/testing/ARQ/Construct/reif-result-1.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<rdf:RDF
-    xmlns:data="http://example.org/data/"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:ns="http://example.org/ns#">
-  <rdf:Description>
-    <rdf:subject rdf:resource="http://example.org/data/x"/>
-    <rdf:predicate rdf:resource="http://example.org/ns#p"/>
-    <rdf:object rdf:datatype="http://www.w3.org/2001/XMLSchema#integer"
-    >2</rdf:object>
-  </rdf:Description>
-  <rdf:Description>
-    <rdf:subject rdf:resource="http://example.org/data/y"/>
-    <rdf:predicate rdf:resource="http://example.org/ns#q"/>
-    <rdf:object rdf:resource="http://example.org/data/x"/>
-  </rdf:Description>
-  <rdf:Description>
-    <rdf:subject rdf:resource="http://example.org/data/x"/>
-    <rdf:predicate rdf:resource="http://example.org/ns#p"/>
-    <rdf:object rdf:datatype="http://www.w3.org/2001/XMLSchema#integer"
-    >1</rdf:object>
-  </rdf:Description>
-</rdf:RDF>
diff --git a/jena-arq/testing/ARQ/Construct/reif-result-2.rdf b/jena-arq/testing/ARQ/Construct/reif-result-2.rdf
deleted file mode 100644
index 2098924c5c..0000000000
--- a/jena-arq/testing/ARQ/Construct/reif-result-2.rdf
+++ /dev/null
@@ -1,11 +0,0 @@
-<rdf:RDF
-    xmlns:data="http://example.org/data/"
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:ns="http://example.org/ns#">
-  <rdf:Description rdf:about="http://example.org/data/x">
-    <ns:p rdf:parseType="Resource">
-    </ns:p>
-    <ns:p rdf:datatype="http://www.w3.org/2001/XMLSchema#integer"
-    >2</ns:p>
-  </rdf:Description>
-</rdf:RDF>
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-1.ttl b/jena-arq/testing/ARQ/Construct/results-construct-1.ttl
deleted file mode 100644
index 12dd5e2f14..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-1.ttl
+++ /dev/null
@@ -1,8 +0,0 @@
-@prefix ns:      <http://example.org/ns#> .
-@prefix :        <http://example.org/> .
-
-:joe
-      ns:knows      _:b1 .
-
-:bill
-      ns:knows      _:b1 .
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-2.ttl b/jena-arq/testing/ARQ/Construct/results-construct-2.ttl
deleted file mode 100644
index db5e6191aa..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-2.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-@prefix ns:      <http://example.org/ns#> .
-@prefix :        <http://example.org/> .
-
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-data-2.ttl b/jena-arq/testing/ARQ/Construct/results-construct-quad-data-2.ttl
deleted file mode 100644
index 858a0bce35..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-data-2.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:s :p :o .
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-dataset.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-dataset.trig
deleted file mode 100644
index 2dd369ab27..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-dataset.trig
+++ /dev/null
@@ -1,4 +0,0 @@
-@prefix : <http://example.org/ns#> .
-{:s :m :o}
-<g1.ttl> {:s1 :m :o1 }
-<g2.ttl> {:s2 :m :o2 }
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-default-graph.ttl b/jena-arq/testing/ARQ/Construct/results-construct-quad-default-graph.ttl
deleted file mode 100644
index c39d57f281..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-default-graph.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:s1 :m :o1 .
-:s2 :m :o2 .
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-named-graph.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-named-graph.trig
deleted file mode 100644
index d789da4a9a..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-named-graph.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-@prefix : <http://example.org/ns#> .
-<g1.ttl> {:s1 :m :o1 }
-<g2.ttl> {:s2 :m :o2 }
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-short-form-1.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-short-form-1.trig
deleted file mode 100644
index 7ed6d7f3b4..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-short-form-1.trig
+++ /dev/null
@@ -1,3 +0,0 @@
-@prefix : <http://example.org/ns#> .
-<g1.ttl> {:s1 :p :o1 }
-<g2.ttl> {:s2 :p :o2 }
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-short-form-2.ttl b/jena-arq/testing/ARQ/Construct/results-construct-quad-short-form-2.ttl
deleted file mode 100644
index 858a0bce35..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-short-form-2.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:s :p :o .
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-short-form-3.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-short-form-3.trig
deleted file mode 100644
index 6b48ffdb51..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-short-form-3.trig
+++ /dev/null
@@ -1,4 +0,0 @@
-@prefix : <http://example.org/ns#> .
-{:s :p :o}
-<g1.ttl> {:s1 :p :o1 }
-<g2.ttl> {:s2 :p :o2 }
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-1.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-1.trig
deleted file mode 100644
index 78c9d0496e..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-1.trig
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix :      <http://example.org/ns#> .
-:g {:s :p :o }
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-2.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-2.trig
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-3.ttl b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-3.ttl
deleted file mode 100644
index 6157b0aa66..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-3.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix :      <http://example.org/ns#> .
-:s :p :o .
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-4.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-4.trig
deleted file mode 100644
index 7fdc75d592..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-4.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix :      <http://example.org/ns#> .
-:s1 :p :o1 .
-:s2 :p :o2 .
-:a1 :b1 :c1 .
-<g1.ttl> {:s :p :o}
-<g2.ttl> {:s :p :o}
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-5.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-5.trig
deleted file mode 100644
index 7fdc75d592..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-5.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix :      <http://example.org/ns#> .
-:s1 :p :o1 .
-:s2 :p :o2 .
-:a1 :b1 :c1 .
-<g1.ttl> {:s :p :o}
-<g2.ttl> {:s :p :o}
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-6.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-6.trig
deleted file mode 100644
index 67d9665e30..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-6.trig
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix :      <http://example.org/ns#> .
-:s1 :p :o1 .
-:s2 :p :o2 .
-:a1 :b1 :c1 .
-<g1.ttl> {:s :p :o. :s1 :p :o1 . :a1 :b1 :c1 .}
-<g2.ttl> {:s :p :o. :s2 :p :o2 .}
\ No newline at end of file
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-7.ttl b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-7.ttl
deleted file mode 100644
index 6157b0aa66..0000000000
--- a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-7.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix :      <http://example.org/ns#> .
-:s :p :o .
diff --git a/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-8.trig b/jena-arq/testing/ARQ/Construct/results-construct-quad-syntax-8.trig
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/jena-arq/testing/ARQ/Dataset/a.ttl b/jena-arq/testing/ARQ/Dataset/a.ttl
deleted file mode 100644
index 2b255a0ed6..0000000000
--- a/jena-arq/testing/ARQ/Dataset/a.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:a :b :c .
diff --git a/jena-arq/testing/ARQ/Dataset/b.ttl b/jena-arq/testing/ARQ/Dataset/b.ttl
deleted file mode 100644
index 93d95141e1..0000000000
--- a/jena-arq/testing/ARQ/Dataset/b.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:c :p :z .
diff --git a/jena-arq/testing/ARQ/Dataset/c.ttl b/jena-arq/testing/ARQ/Dataset/c.ttl
deleted file mode 100644
index 32b428af1d..0000000000
--- a/jena-arq/testing/ARQ/Dataset/c.ttl
+++ /dev/null
@@ -1,3 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:c :p _:z .
-
diff --git a/jena-arq/testing/ARQ/Dataset/d.ttl b/jena-arq/testing/ARQ/Dataset/d.ttl
deleted file mode 100644
index 8b71468bc3..0000000000
--- a/jena-arq/testing/ARQ/Dataset/d.ttl
+++ /dev/null
@@ -1,4 +0,0 @@
-@prefix : <http://example.org/ns#> .
-
-:d :q :r .
-
diff --git a/jena-arq/testing/ARQ/Dataset/dft.ttl b/jena-arq/testing/ARQ/Dataset/dft.ttl
deleted file mode 100644
index b637da3d64..0000000000
--- a/jena-arq/testing/ARQ/Dataset/dft.ttl
+++ /dev/null
@@ -1,2 +0,0 @@
-@prefix : <http://example.org/ns#> .
-:aRoot :q :a .
diff --git a/jena-arq/testing/ARQ/Dataset/empty.nt b/jena-arq/testing/ARQ/Dataset/empty.nt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/jena-arq/testing/ARQ/Dataset/graph-01-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-01-result.ttl
deleted file mode 100644
index 2d32eed547..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-01-result.ttl
+++ /dev/null
@@ -1,6 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable "x", "y", "z", "r", "s";
-.
diff --git a/jena-arq/testing/ARQ/Dataset/graph-01.rq b/jena-arq/testing/ARQ/Dataset/graph-01.rq
deleted file mode 100644
index 6b975bab04..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-01.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-SELECT  *
-FROM       <dft.ttl>
-FROM NAMED <a.ttl> 
-FROM NAMED <b.ttl>
-WHERE
-    { ?x ?y ?z .
-      ?z ?r ?s .
-    }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-02-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-02-result.ttl
deleted file mode 100644
index e9be73d34d..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-02-result.ttl
+++ /dev/null
@@ -1,28 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable "x", "y", "z", "r", "s", "src1", "src2";
-
-    rs:solution [ rs:binding  [ rs:value    <a.ttl> ;
-                                rs:variable "src1"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#a> ;
-                                rs:variable "x"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#b> ;
-                                rs:variable "y"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#c> ;
-                                rs:variable "z"
-                              ] ;
-                  rs:binding  [ rs:value    <b.ttl> ;
-                                rs:variable "src2"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#p> ;
-                                rs:variable "r"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#z> ;
-                                rs:variable "s"
-                              ] ;
-                ] .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-02.rq b/jena-arq/testing/ARQ/Dataset/graph-02.rq
deleted file mode 100644
index 6b9cccfe7b..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-02.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT  *
-FROM        <dft.ttl>
-FROM NAMED  <a.ttl>
-FROM NAMED  <b.ttl>
-WHERE
-    { GRAPH ?src1
-        { ?x ?y ?z } . 
-      GRAPH ?src2
-        { ?z ?r ?s } .
-    }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-03-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-03-result.ttl
deleted file mode 100644
index 9d5afa1cc9..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-03-result.ttl
+++ /dev/null
@@ -1,25 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable "x", "y", "z", "src2", "r", "s";
-
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/ns#aRoot> ;
-                                rs:variable "x"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#q> ;
-                                rs:variable "y"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#a> ;
-                                rs:variable "z"
-                              ] ;
-                  rs:binding  [ rs:value    <a.ttl> ;
-                                rs:variable "src2"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#b> ;
-                                rs:variable "r"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#c> ;
-                                rs:variable "s"
-                              ] ;
-                ] .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-03.rq b/jena-arq/testing/ARQ/Dataset/graph-03.rq
deleted file mode 100644
index be09476f45..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-03.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT  *
-WHERE
-    { ?x ?y ?z . 
-      GRAPH ?src2
-        { ?z ?r ?s } .
-    }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-04-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-04-result.ttl
deleted file mode 100644
index 361cd16256..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-04-result.ttl
+++ /dev/null
@@ -1,54 +0,0 @@
-
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable "src1", "x", "y", "src2", "r", "s", "z";
-
-    rs:solution [ rs:binding  [ rs:value    <a.ttl> ;
-                                rs:variable "src1"
-                              ] ;
-
-                  rs:binding  [ rs:value    <http://example.org/ns#a> ;
-                                rs:variable "x"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#b> ;
-                                rs:variable "y"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#c> ;
-                                rs:variable "z"
-                              ] ;
-                  rs:binding  [ rs:value    <b.ttl> ;
-                                rs:variable "src2"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#p> ;
-                                rs:variable "r"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#z> ;
-                                rs:variable "s"
-                              ] ;
-                ] ;
-
-    rs:solution [ rs:binding  [ rs:value    <dft.ttl> ;
-                                rs:variable "src1"
-                              ] ;
-
-                  rs:binding  [ rs:value    <http://example.org/ns#aRoot> ;
-                                rs:variable "x"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#q> ;
-                                rs:variable "y"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#a> ;
-                                rs:variable "z"
-                              ] ;
-                  rs:binding  [ rs:value    <a.ttl> ;
-                                rs:variable "src2"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#b> ;
-                                rs:variable "r"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#c> ;
-                                rs:variable "s"
-                              ] ;
-                ] .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-04.rq b/jena-arq/testing/ARQ/Dataset/graph-04.rq
deleted file mode 100644
index d68c4ebd4d..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-04.rq
+++ /dev/null
@@ -1,11 +0,0 @@
-SELECT  *
-FROM        <dft.ttl>
-FROM NAMED  <dft.ttl> 
-FROM NAMED  <a.ttl>
-FROM NAMED  <b.ttl>
-WHERE
-    { GRAPH ?src1
-        { ?x ?y ?z } . 
-      GRAPH ?src2
-        { ?z ?r ?s } .
-    }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-05-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-05-result.ttl
deleted file mode 100644
index 132233c188..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-05-result.ttl
+++ /dev/null
@@ -1,54 +0,0 @@
-# Same as graph-04-result.ttl
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>
-                rs:ResultSet ;
-    rs:resultVariable "src1", "x", "y", "src2", "r", "s", "z";
-
-    rs:solution [ rs:binding  [ rs:value    <a.ttl> ;
-                                rs:variable "src1"
-                              ] ;
-
-                  rs:binding  [ rs:value    <http://example.org/ns#a> ;
-                                rs:variable "x"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#b> ;
-                                rs:variable "y"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#c> ;
-                                rs:variable "z"
-                              ] ;
-                  rs:binding  [ rs:value    <b.ttl> ;
-                                rs:variable "src2"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#p> ;
-                                rs:variable "r"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#z> ;
-                                rs:variable "s"
-                              ] ;
-                ] ;
-
-    rs:solution [ rs:binding  [ rs:value    <dft.ttl> ;
-                                rs:variable "src1"
-                              ] ;
-
-                  rs:binding  [ rs:value    <http://example.org/ns#aRoot> ;
-                                rs:variable "x"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#q> ;
-                                rs:variable "y"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#a> ;
-                                rs:variable "z"
-                              ] ;
-                  rs:binding  [ rs:value    <a.ttl> ;
-                                rs:variable "src2"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#b> ;
-                                rs:variable "r"
-                              ] ;
-                  rs:binding  [ rs:value    <http://example.org/ns#c> ;
-                                rs:variable "s"
-                              ] ;
-                ] .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-05.rq b/jena-arq/testing/ARQ/Dataset/graph-05.rq
deleted file mode 100644
index fd1ef1a2b6..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-05.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT  *
-FROM NAMED  <dft.ttl>
-FROM NAMED  <a.ttl>
-FROM NAMED  <b.ttl>
-WHERE
-    { GRAPH ?src1
-        { ?x ?y ?z } . 
-      GRAPH ?src2
-        { ?z ?r ?s } .
-    }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-06-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-06-result.ttl
deleted file mode 100644
index df3f9b4cc9..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-06-result.ttl
+++ /dev/null
@@ -1,27 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "o" ;
-      rs:resultVariable  "p" ;
-      rs:resultVariable  "s" ;
-      rs:solution   [ rs:binding    [ rs:value      <http://example.org/ns#c> ;
-                                      rs:variable   "o"
-                                    ] ;
-                      rs:binding    [ rs:value      <http://example.org/ns#b> ;
-                                      rs:variable   "p"
-                                    ] ;
-                      rs:binding    [ rs:value      <http://example.org/ns#a> ;
-                                      rs:variable   "s"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <http://example.org/ns#z> ;
-                                      rs:variable   "o"
-                                    ] ;
-                      rs:binding    [ rs:value      <http://example.org/ns#p> ;
-                                      rs:variable   "p"
-                                    ] ;
-                      rs:binding    [ rs:value      <http://example.org/ns#c> ;
-                                      rs:variable   "s"
-                                    ]
-                    ] .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-06.rq b/jena-arq/testing/ARQ/Dataset/graph-06.rq
deleted file mode 100644
index 2b3273f433..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-06.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT  ?s ?p ?o
-FROM <dft.ttl> 
-FROM NAMED  <a.ttl>
-FROM NAMED  <b.ttl>
-WHERE
-    { GRAPH ?g { ?s ?p ?o } }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-07-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-07-result.ttl
deleted file mode 100644
index 7b59015c45..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-07-result.ttl
+++ /dev/null
@@ -1,13 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "g" ;
-      rs:solution   [ rs:binding    [ rs:value      <b.ttl> ;
-                                      rs:variable   "g"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <a.ttl> ;
-                                      rs:variable   "g"
-                                    ]
-                    ] .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-07.rq b/jena-arq/testing/ARQ/Dataset/graph-07.rq
deleted file mode 100644
index 3d6abc89b5..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-07.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPARQL query to test the URIs in a dataset
-PREFIX : <.>
-
-
-SELECT ?g 
-FROM       <dft.ttl>
-FROM NAMED <a.ttl>
-FROM NAMED <b.ttl>
-WHERE
-  { GRAPH ?g { } }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-08-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-08-result.ttl
deleted file mode 100644
index 7b59015c45..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-08-result.ttl
+++ /dev/null
@@ -1,13 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "g" ;
-      rs:solution   [ rs:binding    [ rs:value      <b.ttl> ;
-                                      rs:variable   "g"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      <a.ttl> ;
-                                      rs:variable   "g"
-                                    ]
-                    ] .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-08.rq b/jena-arq/testing/ARQ/Dataset/graph-08.rq
deleted file mode 100644
index 3f3752ad42..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-08.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPARQL query to test the URIs in a dataset
-PREFIX : <.>
-
-SELECT ?g 
-WHERE
-  { GRAPH ?g { } }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-09-result.srx b/jena-arq/testing/ARQ/Dataset/graph-09-result.srx
deleted file mode 100644
index 434c385ee9..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-09-result.srx
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="x"/>
-  </head>
-  <results ordered="false" distinct="false">
-    <result>
-    </result>
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Dataset/graph-09.rq b/jena-arq/testing/ARQ/Dataset/graph-09.rq
deleted file mode 100644
index 5df3b04ee7..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-09.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <.>
-
-SELECT ?x
-  { GRAPH <a.ttl> { } }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-10-result.srx b/jena-arq/testing/ARQ/Dataset/graph-10-result.srx
deleted file mode 100644
index e714687ef8..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-10-result.srx
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="x"/>
-  </head>
-  <results ordered="false" distinct="false">
-  </results>
-</sparql>
diff --git a/jena-arq/testing/ARQ/Dataset/graph-10.rq b/jena-arq/testing/ARQ/Dataset/graph-10.rq
deleted file mode 100644
index 34426fe74d..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-10.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <.>
-
-SELECT ?x
-  { GRAPH <notThere.ttl> { } }
diff --git a/jena-arq/testing/ARQ/Dataset/graph-11-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-11-result.ttl
deleted file mode 100644
index a0a97f1455..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-11-result.ttl
+++ /dev/null
@@ -1,9 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "o" ;
-      rs:resultVariable  "s" ;
-      rs:resultVariable  "g" ;
-      rs:resultVariable  "p" .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-11.rq b/jena-arq/testing/ARQ/Dataset/graph-11.rq
deleted file mode 100644
index 126fb814c8..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-11.rq
+++ /dev/null
@@ -1,8 +0,0 @@
-PREFIX : <http://example.org/ns#>
-
-SELECT ?g ?s ?p ?o
-WHERE
-{
-    GRAPH ?x { :c :p ?g }
-    GRAPH ?g { ?s ?p ?o }
-}
diff --git a/jena-arq/testing/ARQ/Dataset/graph-20-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-20-result.ttl
deleted file mode 100644
index a63b62704b..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-20-result.ttl
+++ /dev/null
@@ -1,10 +0,0 @@
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "p" ;
-      rs:resultVariable  "g" ;
-      rs:resultVariable  "s" ;
-      rs:resultVariable  "o" ;
-      rs:size       "0"^^xsd:int .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-20.rq b/jena-arq/testing/ARQ/Dataset/graph-20.rq
deleted file mode 100644
index c14d8b5988..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-20.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-SELECT  *
-FROM       <dft.ttl>
-FROM NAMED <a.ttl> 
-FROM NAMED <b.ttl>
-WHERE
-{
-  GRAPH ?g { ?s ?p ?o . FILTER(?g = <a.ttl>) }
-}
-
diff --git a/jena-arq/testing/ARQ/Dataset/graph-21-result.ttl b/jena-arq/testing/ARQ/Dataset/graph-21-result.ttl
deleted file mode 100644
index 794239b541..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-21-result.ttl
+++ /dev/null
@@ -1,23 +0,0 @@
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "p" ;
-      rs:resultVariable  "g" ;
-      rs:resultVariable  "s" ;
-      rs:resultVariable  "o" ;
-      rs:size       "1"^^xsd:int ;
-      rs:solution   [ rs:binding    [ rs:value      <http://example.org/ns#c> ;
-                                      rs:variable   "o"
-                                    ] ;
-                      rs:binding    [ rs:value      <http://example.org/ns#b> ;
-                                      rs:variable   "p"
-                                    ] ;
-                      rs:binding    [ rs:value      <http://example.org/ns#a> ;
-                                      rs:variable   "s"
-                                    ] ;
-                      rs:binding    [ rs:value      <a.ttl> ;
-                                      rs:variable   "g"
-                                    ]
-                    ] .
diff --git a/jena-arq/testing/ARQ/Dataset/graph-21.rq b/jena-arq/testing/ARQ/Dataset/graph-21.rq
deleted file mode 100644
index 97fdb57ec3..0000000000
--- a/jena-arq/testing/ARQ/Dataset/graph-21.rq
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT  *
-FROM       <dft.ttl>
-FROM NAMED <a.ttl> 
-FROM NAMED <b.ttl>
-WHERE
-{
-  GRAPH ?g { ?s ?p ?o }
-  FILTER(?g = <a.ttl>)
-}
-
diff --git a/jena-arq/testing/ARQ/Dataset/manifest.ttl b/jena-arq/testing/ARQ/Dataset/manifest.ttl
deleted file mode 100644
index d08a280df5..0000000000
--- a/jena-arq/testing/ARQ/Dataset/manifest.ttl
+++ /dev/null
@@ -1,122 +0,0 @@
-#  Licensed to the Apache Software Foundation (ASF) under one or more
-#  contributor license agreements.  See the NOTICE file distributed with
-#  this work for additional information regarding copyright ownership.
-#  The ASF licenses this file to You under the Apache License, Version 2.0
-#  (the "License"); you may not use this file except in compliance with
-#  the License.  You may obtain a copy of the License at
-# 
-#       http://www.apache.org/licenses/LICENSE-2.0
-# 
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix dawgt:   <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:label "Dataset" ;
-    mf:entries
-    (
-     [  mf:name    "graph-01" ;
-        mf:action
-            [ qt:query  <graph-01.rq> ] ;
-        mf:result  <graph-01-result.ttl> ;
-      ]
-
-     [  mf:name    "graph-02" ;
-        mf:action
-            [ qt:query  <graph-02.rq> ] ;
-        mf:result  <graph-02-result.ttl> ;
-      ]
-
-     [  mf:name    "graph-03" ;
-        mf:action
-            [ qt:query  <graph-03.rq> ;
-              qt:data   <dft.ttl> ;
-              qt:graphData  <a.ttl> ;
-              qt:graphData  <b.ttl> ;
-            ] ;
-        mf:result  <graph-03-result.ttl> ;
-      ]
-
-     [  mf:name    "graph-04" ;
-        mf:action
-            [ qt:query  <graph-04.rq> ] ;
-        mf:result  <graph-04-result.ttl> ;
-      ]
-
-     [  mf:name    "graph-05" ;
-        mf:action
-            [ qt:query  <graph-05.rq> ] ;
-        # Result is the same as for graph-04
-        mf:result  <graph-05-result.ttl> ;
-      ]
-
-     [  mf:name    "graph-06" ;
-        mf:action
... 58399 lines suppressed ...