From 1054a7cdf209dedb1afc7ed3ba87b5424ffa6140 Mon Sep 17 00:00:00 2001
From: Jitse De Smet <jitse@reedonk8.be>
Date: Thu, 7 May 2026 11:47:57 +0000
Subject: [PATCH 1/4] feat: support useQuads: false for update queries and
 clean up test fixtures

- Remove error throw in translateInsertDelete when useQuads is false
- Handle WITH clause correctly: use GRAPH algebra node when useQuads
  is false instead of recurseGraph which pushes into quad patterns
- Update test-utils algebraGenerators to yield both quads: false and
  quads: true variants based on fixture existence
- Update algebra.test.ts consumers to use test.quads from generator
- Update generateJson.test.ts to generate both quads variants per query
- Remove 141 duplicate -quads.sparql files from sparql statics dir
  (SPARQL queries are identical regardless of quads setting)
- Add non-quads algebra/canonical-sparql fixtures for all update tests

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../algebra-sparql-1-1/test/algebra.test.ts   |   4 +-
 .../test/extraCoverage.test.ts                |  21 +-
 .../test/generateJson.test.ts                 |  69 ++--
 .../algebra-sparql-1-2/test/algebra.test.ts   |   8 +-
 .../test/generateJson.test.ts                 |  69 ++--
 .../lib/toAlgebra/updates.ts                  |  13 +-
 .../lib/generators/algebraGenerators.ts       |  65 ++--
 .../sparql-1.1/delete/delete-with-02.json     |  84 +++++
 .../update/insert-blank-where.json            |  50 +++
 .../sparql11-query/update/insert-blanks.json  |  53 +++
 .../update/sparql-update-1-1-1.json           |  29 ++
 .../update/sparql-update-3-1-1a.json          |  53 +++
 .../update/sparql-update-3-1-1b.json          |  29 ++
 .../update/sparql-update-3-1-2a.json          |  53 +++
 .../update/sparql-update-3-1-2b.json          |  63 ++++
 .../update/sparql-update-3-1-3-1a.json        | 100 ++++++
 .../update/sparql-update-3-1-3-1b.json        |  81 +++++
 .../update/sparql-update-3-1-3-2a.json        | 107 ++++++
 .../update/sparql-update-3-1-3-2b.json        | 107 ++++++
 .../update/sparql-update-3-1-3-2c.json        | 239 ++++++++++++++
 .../update/sparql-update-3-1-3-3a.json        |  98 ++++++
 .../update/sparql-update-3-1-3-3b.json        | 138 ++++++++
 .../update/sparql-update-3-1-3.json           |  91 ++++++
 .../update/sparql-update-4-2-4.json           |  68 ++++
 .../sparql11-query/update/using.json          |  65 ++++
 ...arql-1-2-syntax-update-anonreifier-01.json |  61 ++++
 ...arql-1-2-syntax-update-anonreifier-02.json |  81 +++++
 ...arql-1-2-syntax-update-anonreifier-03.json | 234 ++++++++++++++
 ...arql-1-2-syntax-update-anonreifier-04.json | 306 ++++++++++++++++++
 ...arql-1-2-syntax-update-anonreifier-05.json | 234 ++++++++++++++
 ...arql-1-2-syntax-update-anonreifier-06.json | 130 ++++++++
 .../sparql-1-2-syntax-update-reifier-01.json  |  61 ++++
 .../sparql-1-2-syntax-update-reifier-02.json  |  81 +++++
 .../sparql-1-2-syntax-update-reifier-03.json  | 234 ++++++++++++++
 .../sparql-1-2-syntax-update-reifier-04.json  | 306 ++++++++++++++++++
 .../sparql-1-2-syntax-update-reifier-05.json  | 234 ++++++++++++++
 .../sparql-1-2-syntax-update-reifier-06.json  | 130 ++++++++
 .../sparql-1-2-syntax-update-reifier-07.json  | 180 +++++++++++
 .../sparql-1-2-syntax-update-reifier-08.json  | 175 ++++++++++
 ...parql-1-2-syntax-update-tripleterm-01.json |  41 +++
 ...parql-1-2-syntax-update-tripleterm-03.json | 226 +++++++++++++
 ...parql-1-2-syntax-update-tripleterm-04.json | 258 +++++++++++++++
 ...parql-1-2-syntax-update-tripleterm-05.json | 226 +++++++++++++
 .../sparql-1.1/delete/delete-with-02.json     |  84 +++++
 .../update/insert-blank-where.json            |  50 +++
 .../sparql11-query/update/insert-blanks.json  |  53 +++
 .../update/sparql-update-1-1-1.json           |  29 ++
 .../update/sparql-update-3-1-1a.json          |  53 +++
 .../update/sparql-update-3-1-1b.json          |  29 ++
 .../update/sparql-update-3-1-2a.json          |  53 +++
 .../update/sparql-update-3-1-2b.json          |  63 ++++
 .../update/sparql-update-3-1-3-1a.json        | 100 ++++++
 .../update/sparql-update-3-1-3-1b.json        |  81 +++++
 .../update/sparql-update-3-1-3-2a.json        | 107 ++++++
 .../update/sparql-update-3-1-3-2b.json        | 107 ++++++
 .../update/sparql-update-3-1-3-2c.json        | 239 ++++++++++++++
 .../update/sparql-update-3-1-3-3a.json        |  98 ++++++
 .../update/sparql-update-3-1-3-3b.json        | 138 ++++++++
 .../update/sparql-update-3-1-3.json           |  91 ++++++
 .../update/sparql-update-4-2-4.json           |  68 ++++
 .../algebra/sparql11-query/update/using.json  |  65 ++++
 ...arql-1-2-syntax-update-anonreifier-01.json |  61 ++++
 ...arql-1-2-syntax-update-anonreifier-02.json |  81 +++++
 ...arql-1-2-syntax-update-anonreifier-03.json | 234 ++++++++++++++
 ...arql-1-2-syntax-update-anonreifier-04.json | 306 ++++++++++++++++++
 ...arql-1-2-syntax-update-anonreifier-05.json | 234 ++++++++++++++
 ...arql-1-2-syntax-update-anonreifier-06.json | 130 ++++++++
 .../sparql-1-2-syntax-update-reifier-01.json  |  61 ++++
 .../sparql-1-2-syntax-update-reifier-02.json  |  81 +++++
 .../sparql-1-2-syntax-update-reifier-03.json  | 234 ++++++++++++++
 .../sparql-1-2-syntax-update-reifier-04.json  | 306 ++++++++++++++++++
 .../sparql-1-2-syntax-update-reifier-05.json  | 234 ++++++++++++++
 .../sparql-1-2-syntax-update-reifier-06.json  | 130 ++++++++
 .../sparql-1-2-syntax-update-reifier-07.json  | 180 +++++++++++
 .../sparql-1-2-syntax-update-reifier-08.json  | 175 ++++++++++
 ...parql-1-2-syntax-update-tripleterm-01.json |  41 +++
 ...parql-1-2-syntax-update-tripleterm-03.json | 226 +++++++++++++
 ...parql-1-2-syntax-update-tripleterm-04.json | 258 +++++++++++++++
 ...parql-1-2-syntax-update-tripleterm-05.json | 226 +++++++++++++
 .../sparql-1.1/delete/delete-with-02.sparql   |  13 +
 .../update/insert-blank-where.sparql          |   6 +
 .../update/insert-blanks.sparql               |   4 +
 .../update/sparql-update-1-1-1.sparql         |   3 +
 .../update/sparql-update-3-1-1a.sparql        |   4 +
 .../update/sparql-update-3-1-1b.sparql        |   5 +
 .../update/sparql-update-3-1-2a.sparql        |   4 +
 .../update/sparql-update-3-1-2b.sparql        |  11 +
 .../update/sparql-update-3-1-3-1a.sparql      |   8 +
 .../update/sparql-update-3-1-3-1b.sparql      |  11 +
 .../update/sparql-update-3-1-3-2a.sparql      |  14 +
 .../update/sparql-update-3-1-3-2b.sparql      |  14 +
 .../update/sparql-update-3-1-3-2c.sparql      |  30 ++
 .../update/sparql-update-3-1-3-3a.sparql      |   4 +
 .../update/sparql-update-3-1-3-3b.sparql      |   9 +
 .../update/sparql-update-3-1-3.sparql         |  15 +
 .../update/sparql-update-4-2-4.sparql         |   7 +
 .../base/sparql11-query/update/using.sparql   |   8 +
 ...ql-1-2-syntax-update-anonreifier-01.sparql |   4 +
 ...ql-1-2-syntax-update-anonreifier-02.sparql |   5 +
 ...ql-1-2-syntax-update-anonreifier-03.sparql |  12 +
 ...ql-1-2-syntax-update-anonreifier-04.sparql |  14 +
 ...ql-1-2-syntax-update-anonreifier-05.sparql |  12 +
 ...ql-1-2-syntax-update-anonreifier-06.sparql |   9 +
 ...sparql-1-2-syntax-update-reifier-01.sparql |   4 +
 ...sparql-1-2-syntax-update-reifier-02.sparql |   5 +
 ...sparql-1-2-syntax-update-reifier-03.sparql |  12 +
 ...sparql-1-2-syntax-update-reifier-04.sparql |  14 +
 ...sparql-1-2-syntax-update-reifier-05.sparql |  12 +
 ...sparql-1-2-syntax-update-reifier-06.sparql |   9 +
 ...sparql-1-2-syntax-update-reifier-07.sparql |  10 +
 ...sparql-1-2-syntax-update-reifier-08.sparql |  11 +
 ...rql-1-2-syntax-update-tripleterm-01.sparql |   3 +
 ...rql-1-2-syntax-update-tripleterm-03.sparql |  10 +
 ...rql-1-2-syntax-update-tripleterm-04.sparql |  10 +
 ...rql-1-2-syntax-update-tripleterm-05.sparql |  10 +
 .../sparql-1.1/delete/delete-with-02.sparql   |  13 +
 .../update/insert-blank-where.sparql          |   6 +
 .../update/insert-blanks.sparql               |   4 +
 .../update/sparql-update-1-1-1.sparql         |   3 +
 .../update/sparql-update-3-1-1a.sparql        |   4 +
 .../update/sparql-update-3-1-1b.sparql        |   5 +
 .../update/sparql-update-3-1-2a.sparql        |   4 +
 .../update/sparql-update-3-1-2b.sparql        |  11 +
 .../update/sparql-update-3-1-3-1a.sparql      |   8 +
 .../update/sparql-update-3-1-3-1b.sparql      |  11 +
 .../update/sparql-update-3-1-3-2a.sparql      |  14 +
 .../update/sparql-update-3-1-3-2b.sparql      |  14 +
 .../update/sparql-update-3-1-3-2c.sparql      |  30 ++
 .../update/sparql-update-3-1-3-3a.sparql      |   4 +
 .../update/sparql-update-3-1-3-3b.sparql      |   9 +
 .../update/sparql-update-3-1-3.sparql         |  15 +
 .../update/sparql-update-4-2-4.sparql         |   7 +
 .../sparql11-query/update/using.sparql        |   8 +
 ...ql-1-2-syntax-update-anonreifier-01.sparql |   4 +
 ...ql-1-2-syntax-update-anonreifier-02.sparql |   5 +
 ...ql-1-2-syntax-update-anonreifier-03.sparql |  12 +
 ...ql-1-2-syntax-update-anonreifier-04.sparql |  14 +
 ...ql-1-2-syntax-update-anonreifier-05.sparql |  12 +
 ...ql-1-2-syntax-update-anonreifier-06.sparql |   9 +
 ...sparql-1-2-syntax-update-reifier-01.sparql |   4 +
 ...sparql-1-2-syntax-update-reifier-02.sparql |   5 +
 ...sparql-1-2-syntax-update-reifier-03.sparql |  12 +
 ...sparql-1-2-syntax-update-reifier-04.sparql |  14 +
 ...sparql-1-2-syntax-update-reifier-05.sparql |  12 +
 ...sparql-1-2-syntax-update-reifier-06.sparql |   9 +
 ...sparql-1-2-syntax-update-reifier-07.sparql |  10 +
 ...sparql-1-2-syntax-update-reifier-08.sparql |  11 +
 ...rql-1-2-syntax-update-tripleterm-01.sparql |   3 +
 ...rql-1-2-syntax-update-tripleterm-03.sparql |  10 +
 ...rql-1-2-syntax-update-tripleterm-04.sparql |  10 +
 ...rql-1-2-syntax-update-tripleterm-05.sparql |  10 +
 ...-02-quads.sparql => delete-with-02.sparql} |   0
 .../exists-within-graph-pattern-quads.sparql  |   7 -
 .../06-path-with-two-graphs-quads.sparql      |   6 -
 .../service/service-in-graph-quads.sparql     |   3 -
 .../service/service-with-graph-quads.sparql   |   3 -
 ...subquery-within-graph-pattern-quads.sparql |   7 -
 ...ttern-graph-variable-is-bound-quads.sparql |   5 -
 ...rn-graph-variable-is-extended-quads.sparql |   5 -
 ...n-graph-variable-is-not-bound-quads.sparql |   5 -
 .../07-subquery-with-from-quads.sparql        |   7 -
 .../graph-aggregate-quads.sparql              |   1 -
 .../sparql11-query/graph-join-quads.sparql    |  10 -
 .../graph-multiple-quads.sparql               |   6 -
 .../graph-with-path-quads.sparql              |   9 -
 ...quads.sparql => insert-blank-where.sparql} |   0
 ...anks-quads.sparql => insert-blanks.sparql} |   0
 ...uads.sparql => sparql-update-1-1-1.sparql} |   0
 ...ads.sparql => sparql-update-3-1-1a.sparql} |   0
 ...ads.sparql => sparql-update-3-1-1b.sparql} |   0
 ...ads.sparql => sparql-update-3-1-2a.sparql} |   0
 ...ads.sparql => sparql-update-3-1-2b.sparql} |   0
 ...s.sparql => sparql-update-3-1-3-1a.sparql} |   0
 ...s.sparql => sparql-update-3-1-3-1b.sparql} |   0
 ...s.sparql => sparql-update-3-1-3-2a.sparql} |   0
 ...s.sparql => sparql-update-3-1-3-2b.sparql} |   0
 ...s.sparql => sparql-update-3-1-3-2c.sparql} |   0
 ...s.sparql => sparql-update-3-1-3-3a.sparql} |   0
 ...s.sparql => sparql-update-3-1-3-3b.sparql} |   0
 ...uads.sparql => sparql-update-3-1-3.sparql} |   0
 ...uads.sparql => sparql-update-4-2-4.sparql} |   0
 .../{using-quads.sparql => using.sparql}      |   0
 ...1-2-annotation-anonreifier-01-quads.sparql |   5 -
 ...1-2-annotation-anonreifier-02-quads.sparql |  12 -
 ...1-2-annotation-anonreifier-03-quads.sparql |   6 -
 ...1-2-annotation-anonreifier-04-quads.sparql |   6 -
 ...1-2-annotation-anonreifier-05-quads.sparql |   6 -
 ...1-2-annotation-anonreifier-06-quads.sparql |   5 -
 ...1-2-annotation-anonreifier-07-quads.sparql |   5 -
 ...1-2-annotation-anonreifier-08-quads.sparql |   6 -
 ...1-2-annotation-anonreifier-09-quads.sparql |   5 -
 ...ation-anonreifier-multiple-01-quads.sparql |   5 -
 ...ation-anonreifier-multiple-02-quads.sparql |   5 -
 ...ation-anonreifier-multiple-03-quads.sparql |   5 -
 ...ation-anonreifier-multiple-04-quads.sparql |   5 -
 ...rql-1-2-annotation-reifier-01-quads.sparql |   5 -
 ...rql-1-2-annotation-reifier-02-quads.sparql |  12 -
 ...rql-1-2-annotation-reifier-03-quads.sparql |   6 -
 ...rql-1-2-annotation-reifier-04-quads.sparql |   6 -
 ...rql-1-2-annotation-reifier-05-quads.sparql |   6 -
 ...rql-1-2-annotation-reifier-06-quads.sparql |   5 -
 ...rql-1-2-annotation-reifier-07-quads.sparql |   5 -
 ...rql-1-2-annotation-reifier-08-quads.sparql |   6 -
 ...rql-1-2-annotation-reifier-09-quads.sparql |   5 -
 ...nnotation-reifier-multiple-01-quads.sparql |   5 -
 ...nnotation-reifier-multiple-02-quads.sparql |   5 -
 ...nnotation-reifier-multiple-03-quads.sparql |   5 -
 ...nnotation-reifier-multiple-04-quads.sparql |   5 -
 ...nnotation-reifier-multiple-05-quads.sparql |   5 -
 ...nnotation-reifier-multiple-06-quads.sparql |   5 -
 ...nnotation-reifier-multiple-07-quads.sparql |   5 -
 ...nnotation-reifier-multiple-08-quads.sparql |   5 -
 ...nnotation-reifier-multiple-09-quads.sparql |   5 -
 ...nnotation-reifier-multiple-10-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-01-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-02-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-03-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-04-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-06-quads.sparql |   4 -
 ...2-syntax-basic-anonreifier-07-quads.sparql |   6 -
 ...2-syntax-basic-anonreifier-08-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-09-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-10-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-11-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-12-quads.sparql |   5 -
 ...2-syntax-basic-anonreifier-13-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-01-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-02-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-03-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-04-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-06-quads.sparql |   4 -
 ...l-1-2-syntax-basic-reifier-07-quads.sparql |   6 -
 ...l-1-2-syntax-basic-reifier-08-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-09-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-10-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-11-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-12-quads.sparql |   5 -
 ...l-1-2-syntax-basic-reifier-13-quads.sparql |   5 -
 ...-2-syntax-basic-tripleterm-01-quads.sparql |   5 -
 ...-2-syntax-basic-tripleterm-02-quads.sparql |   5 -
 ...-2-syntax-basic-tripleterm-03-quads.sparql |   5 -
 ...-2-syntax-basic-tripleterm-04-quads.sparql |   5 -
 ...-2-syntax-basic-tripleterm-05-quads.sparql |  10 -
 ...-2-syntax-basic-tripleterm-06-quads.sparql |   4 -
 ...-2-syntax-basic-tripleterm-07-quads.sparql |   6 -
 ...2-syntax-bnode-anonreifier-01-quads.sparql |   5 -
 ...2-syntax-bnode-anonreifier-02-quads.sparql |   5 -
 ...2-syntax-bnode-anonreifier-03-quads.sparql |   5 -
 ...l-1-2-syntax-bnode-reifier-01-quads.sparql |   5 -
 ...l-1-2-syntax-bnode-reifier-02-quads.sparql |   5 -
 ...l-1-2-syntax-bnode-reifier-03-quads.sparql |   5 -
 ...-2-syntax-bnode-tripleterm-01-quads.sparql |   5 -
 ...-2-syntax-bnode-tripleterm-02-quads.sparql |   5 -
 ...-2-syntax-bnode-tripleterm-03-quads.sparql |   5 -
 ...parql-1-2-syntax-compound-all-quads.sparql |  10 -
 ...2-syntax-compound-anonreifier-quads.sparql |  10 -
 ...l-1-2-syntax-compound-reifier-quads.sparql |  10 -
 ...-2-syntax-compound-tripleterm-quads.sparql |   9 -
 ...1-2-syntax-expr-tripleterm-01-quads.sparql |   6 -
 ...1-2-syntax-expr-tripleterm-03-quads.sparql |   6 -
 ...1-2-syntax-expr-tripleterm-04-quads.sparql |   6 -
 ...1-2-syntax-expr-tripleterm-05-quads.sparql |   9 -
 ...1-2-syntax-expr-tripleterm-06-quads.sparql |  10 -
 ...-syntax-inside-anonreifier-01-quads.sparql |   5 -
 ...-syntax-inside-anonreifier-02-quads.sparql |   5 -
 ...-1-2-syntax-inside-reifier-01-quads.sparql |   5 -
 ...-1-2-syntax-inside-reifier-02-quads.sparql |   5 -
 ...2-syntax-inside-tripleterm-01-quads.sparql |   5 -
 ...2-syntax-inside-tripleterm-02-quads.sparql |   5 -
 ...-syntax-nested-anonreifier-01-quads.sparql |   6 -
 ...-syntax-nested-anonreifier-02-quads.sparql |   6 -
 ...-1-2-syntax-nested-reifier-01-quads.sparql |   6 -
 ...-1-2-syntax-nested-reifier-02-quads.sparql |   6 -
 ...2-syntax-nested-tripleterm-01-quads.sparql |   6 -
 ...l-1-2-syntax-update-anonreifier-01.sparql} |   0
 ...l-1-2-syntax-update-anonreifier-02.sparql} |   0
 ...l-1-2-syntax-update-anonreifier-03.sparql} |   0
 ...l-1-2-syntax-update-anonreifier-04.sparql} |   0
 ...l-1-2-syntax-update-anonreifier-05.sparql} |   0
 ...l-1-2-syntax-update-anonreifier-06.sparql} |   0
 ...parql-1-2-syntax-update-reifier-01.sparql} |   0
 ...parql-1-2-syntax-update-reifier-02.sparql} |   0
 ...parql-1-2-syntax-update-reifier-03.sparql} |   0
 ...parql-1-2-syntax-update-reifier-04.sparql} |   0
 ...parql-1-2-syntax-update-reifier-05.sparql} |   0
 ...parql-1-2-syntax-update-reifier-06.sparql} |   0
 ...parql-1-2-syntax-update-reifier-07.sparql} |   0
 ...parql-1-2-syntax-update-reifier-08.sparql} |   0
 ...ql-1-2-syntax-update-tripleterm-01.sparql} |   0
 ...ql-1-2-syntax-update-tripleterm-03.sparql} |   0
 ...ql-1-2-syntax-update-tripleterm-04.sparql} |   0
 ...ql-1-2-syntax-update-tripleterm-05.sparql} |   0
 292 files changed, 10227 insertions(+), 703 deletions(-)
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-02.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/insert-blank-where.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/insert-blanks.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-1-1-1.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-1a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-1b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-2a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-2b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-1a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-1b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2c.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-3a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-3b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-4-2-4.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/using.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-01.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-02.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-03.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-04.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-05.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-06.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-01.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-02.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-03.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-04.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-05.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-06.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-07.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-08.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-01.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-03.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-04.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-05.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-02.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/insert-blank-where.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/insert-blanks.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-1-1-1.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-1a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-1b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-2a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-2b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-1a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-1b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2c.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-3a.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-3b.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-4-2-4.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/using.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-01.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-02.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-03.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-04.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-05.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-06.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-01.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-02.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-03.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-04.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-05.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-06.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-07.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-08.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-01.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-03.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-04.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-05.json
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-02.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/insert-blank-where.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/insert-blanks.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-1-1-1.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-1a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-1b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-2a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-2b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-1a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-1b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2c.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-3a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-3b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-4-2-4.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/using.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-01.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-02.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-03.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-04.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-05.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-06.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-07.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-08.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-02.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/insert-blank-where.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/insert-blanks.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-1-1-1.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-1a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-1b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-2a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-2b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-1a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-1b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2c.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-3a.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-3b.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-4-2-4.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/using.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-01.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-02.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-03.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-04.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-05.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-06.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-07.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-08.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql
 rename packages/test-utils/statics/algebra/sparql/sparql-1.1/delete/{delete-with-02-quads.sparql => delete-with-02.sparql} (100%)
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/exists/exists-within-graph-pattern-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/paths/06-path-with-two-graphs-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/service/service-in-graph-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/service/service-with-graph-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/01-subquery-within-graph-pattern-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/02-subquery-within-graph-pattern-graph-variable-is-bound-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/02b-subquery-within-graph-pattern-graph-variable-is-extended-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/03-subquery-within-graph-pattern-graph-variable-is-not-bound-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/07-subquery-with-from-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql11-query/graph-aggregate-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql11-query/graph-join-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql11-query/graph-multiple-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql11-query/graph-with-path-quads.sparql
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{insert-blank-where-quads.sparql => insert-blank-where.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{insert-blanks-quads.sparql => insert-blanks.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-1-1-1-quads.sparql => sparql-update-1-1-1.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-1a-quads.sparql => sparql-update-3-1-1a.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-1b-quads.sparql => sparql-update-3-1-1b.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-2a-quads.sparql => sparql-update-3-1-2a.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-2b-quads.sparql => sparql-update-3-1-2b.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-3-1a-quads.sparql => sparql-update-3-1-3-1a.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-3-1b-quads.sparql => sparql-update-3-1-3-1b.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-3-2a-quads.sparql => sparql-update-3-1-3-2a.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-3-2b-quads.sparql => sparql-update-3-1-3-2b.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-3-2c-quads.sparql => sparql-update-3-1-3-2c.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-3-3a-quads.sparql => sparql-update-3-1-3-3a.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-3-3b-quads.sparql => sparql-update-3-1-3-3b.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-3-1-3-quads.sparql => sparql-update-3-1-3.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{sparql-update-4-2-4-quads.sparql => sparql-update-4-2-4.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql11-query/update/{using-quads.sparql => using.sparql} (100%)
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-04-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-05-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-06-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-07-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-08-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-09-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-04-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-04-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-05-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-06-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-07-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-08-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-09-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-04-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-05-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-06-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-07-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-08-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-09-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-10-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-04-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-06-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-07-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-08-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-09-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-10-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-11-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-12-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-13-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-04-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-06-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-07-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-08-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-09-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-10-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-11-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-12-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-13-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-04-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-05-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-06-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-07-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-all-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-anonreifier-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-reifier-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-tripleterm-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-03-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-04-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-05-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-06-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-anonreifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-anonreifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-reifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-reifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-tripleterm-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-tripleterm-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-anonreifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-anonreifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-reifier-01-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-reifier-02-quads.sparql
 delete mode 100644 packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-tripleterm-01-quads.sparql
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-anonreifier-01-quads.sparql => sparql-1-2-syntax-update-anonreifier-01.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-anonreifier-02-quads.sparql => sparql-1-2-syntax-update-anonreifier-02.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-anonreifier-03-quads.sparql => sparql-1-2-syntax-update-anonreifier-03.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-anonreifier-04-quads.sparql => sparql-1-2-syntax-update-anonreifier-04.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-anonreifier-05-quads.sparql => sparql-1-2-syntax-update-anonreifier-05.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-anonreifier-06-quads.sparql => sparql-1-2-syntax-update-anonreifier-06.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-reifier-01-quads.sparql => sparql-1-2-syntax-update-reifier-01.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-reifier-02-quads.sparql => sparql-1-2-syntax-update-reifier-02.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-reifier-03-quads.sparql => sparql-1-2-syntax-update-reifier-03.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-reifier-04-quads.sparql => sparql-1-2-syntax-update-reifier-04.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-reifier-05-quads.sparql => sparql-1-2-syntax-update-reifier-05.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-reifier-06-quads.sparql => sparql-1-2-syntax-update-reifier-06.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-reifier-07-quads.sparql => sparql-1-2-syntax-update-reifier-07.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-reifier-08-quads.sparql => sparql-1-2-syntax-update-reifier-08.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-tripleterm-01-quads.sparql => sparql-1-2-syntax-update-tripleterm-01.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-tripleterm-03-quads.sparql => sparql-1-2-syntax-update-tripleterm-03.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-tripleterm-04-quads.sparql => sparql-1-2-syntax-update-tripleterm-04.sparql} (100%)
 rename packages/test-utils/statics/algebra/sparql/sparql12/{sparql-1-2-syntax-update-tripleterm-05-quads.sparql => sparql-1-2-syntax-update-tripleterm-05.sparql} (100%)

diff --git a/engines/algebra-sparql-1-1/test/algebra.test.ts b/engines/algebra-sparql-1-1/test/algebra.test.ts
index 76932465..e18c7224 100644
--- a/engines/algebra-sparql-1-1/test/algebra.test.ts
+++ b/engines/algebra-sparql-1-1/test/algebra.test.ts
@@ -19,12 +19,12 @@ describe('algebra output', () => {
     describe(suite, () => {
       for (const blankToVariable of [ true, false ]) {
         for (const test of sparqlAlgebraTests(suite, blankToVariable, true)) {
-          const { name, json, sparql: query } = test;
+          const { name, json, quads, sparql: query } = test;
           it(`${name}${blankToVariable ? ' (no blanks)' : ''}`, ({ expect }) => {
             const ast = parser.parse(query);
             const algebra = algebraUtils.objectify(
               toAlgebra(ast, {
-                quads: name.endsWith('-quads'),
+                quads,
                 blankToVariable,
               }),
             );
diff --git a/engines/algebra-sparql-1-1/test/extraCoverage.test.ts b/engines/algebra-sparql-1-1/test/extraCoverage.test.ts
index 98e2761b..90e5048c 100644
--- a/engines/algebra-sparql-1-1/test/extraCoverage.test.ts
+++ b/engines/algebra-sparql-1-1/test/extraCoverage.test.ts
@@ -70,12 +70,23 @@ GROUP BY ( ?y AS ?x )`);
     });
   });
 
-  describe('insert/DELETE without quads option throws', () => {
-    it('toAlgebra throws when INSERT DATA is converted without quads option', ({ expect }) => {
+  describe('insert/DELETE without quads option works', () => {
+    it('toAlgebra succeeds when INSERT DATA is converted without quads option', ({ expect }) => {
       const ast = parser.parse('INSERT DATA { <http://s> <http://p> <http://o> }');
-      expect(() => toAlgebra(ast, { quads: false })).toThrowError(
-        /INSERT\/DELETE operations are only supported with quads option enabled/u,
-      );
+      const result = algebraUtils.objectify(toAlgebra(ast, { quads: false }));
+      expect(result).toMatchObject({
+        type: 'deleteinsert',
+        insert: [
+          {
+            type: 'pattern',
+            termType: 'Quad',
+            subject: { termType: 'NamedNode', value: 'http://s' },
+            predicate: { termType: 'NamedNode', value: 'http://p' },
+            object: { termType: 'NamedNode', value: 'http://o' },
+            graph: { termType: 'DefaultGraph', value: '' },
+          },
+        ],
+      });
     });
   });
 
diff --git a/engines/algebra-sparql-1-1/test/generateJson.test.ts b/engines/algebra-sparql-1-1/test/generateJson.test.ts
index 692302ce..a7cf56d8 100644
--- a/engines/algebra-sparql-1-1/test/generateJson.test.ts
+++ b/engines/algebra-sparql-1-1/test/generateJson.test.ts
@@ -25,43 +25,46 @@ describe.skip('algebra test generate', () => {
   for (const suite of suites) {
     describe(suite, () => {
       for (const { query, name } of sparqlQueries(suite)) {
-        for (const blankToVariable of [ false, true ]) {
-          it(`${name} - blankToVar: ${blankToVariable}`, ({ expect }) => {
-            expect(() => {
-              astFactory.resetBlankNodeCounter();
-              const ast = parser.parse(query, { astFactory });
-              const algebra = algebraUtils.objectify(toAlgebra(ast, {
-                quads: name.endsWith('-quads'),
-                blankToVariable,
-              }));
-              const canonicalString = generator.generate(toAst(algebra));
+        for (const quads of [ false, true ]) {
+          for (const blankToVariable of [ false, true ]) {
+            const suffix = quads ? '-quads' : '';
+            it(`${name}${suffix} - blankToVar: ${blankToVariable}`, ({ expect }) => {
+              expect(() => {
+                astFactory.resetBlankNodeCounter();
+                const ast = parser.parse(query, { astFactory });
+                const algebra = algebraUtils.objectify(toAlgebra(ast, {
+                  quads,
+                  blankToVariable,
+                }));
+                const canonicalString = generator.generate(toAst(algebra));
 
-              const algebraFileName = `${name}.json`;
-              let newPath = blankToVariable ? rootJsonBlankToVariable : rootJson;
-              let newPathCanonical = blankToVariable ? canonicalSparqlBlankToVar : canonicalSparqlBase;
-              for (const piece of name.split(sep).slice(0, -1)) {
-                newPath = join(newPath, piece);
-                if (!existsSync(newPath)) {
-                  mkdirSync(newPath);
+                const algebraFileName = `${name}${suffix}.json`;
+                let newPath = blankToVariable ? rootJsonBlankToVariable : rootJson;
+                let newPathCanonical = blankToVariable ? canonicalSparqlBlankToVar : canonicalSparqlBase;
+                for (const piece of name.split(sep).slice(0, -1)) {
+                  newPath = join(newPath, piece);
+                  if (!existsSync(newPath)) {
+                    mkdirSync(newPath);
+                  }
                 }
-              }
-              for (const piece of name.split(sep).slice(0, -1)) {
-                newPathCanonical = join(newPathCanonical, piece);
-                if (!existsSync(newPathCanonical)) {
-                  mkdirSync(newPathCanonical);
+                for (const piece of name.split(sep).slice(0, -1)) {
+                  newPathCanonical = join(newPathCanonical, piece);
+                  if (!existsSync(newPathCanonical)) {
+                    mkdirSync(newPathCanonical);
+                  }
                 }
-              }
 
-              writeFileSync(
-                join(blankToVariable ? rootJsonBlankToVariable : rootJson, algebraFileName),
-                JSON.stringify(algebra, null, 2),
-              );
-              writeFileSync(
-                join(blankToVariable ? canonicalSparqlBlankToVar : canonicalSparqlBase, `${name}.sparql`),
-                canonicalString,
-              );
-            }).not.toThrow();
-          });
+                writeFileSync(
+                  join(blankToVariable ? rootJsonBlankToVariable : rootJson, algebraFileName),
+                  JSON.stringify(algebra, null, 2),
+                );
+                writeFileSync(
+                  join(blankToVariable ? canonicalSparqlBlankToVar : canonicalSparqlBase, `${name}${suffix}.sparql`),
+                  canonicalString,
+                );
+              }).not.toThrow();
+            });
+          }
         }
       }
     });
diff --git a/engines/algebra-sparql-1-2/test/algebra.test.ts b/engines/algebra-sparql-1-2/test/algebra.test.ts
index 81f4d1c8..36194641 100644
--- a/engines/algebra-sparql-1-2/test/algebra.test.ts
+++ b/engines/algebra-sparql-1-2/test/algebra.test.ts
@@ -25,16 +25,12 @@ describe('algebra output 1.2', () => {
     describe(suite, () => {
       for (const blankToVariable of [ true, false ]) {
         for (const test of sparqlAlgebraTests(suite, blankToVariable, true)) {
-          const { name, json, sparql: query } = test;
-          // If (!name.includes('sparql-1-2-syntax-nested-anonreifier-01') ||
-          //   blankToVariable || name.includes('-quads')) {
-          //   continue;
-          // }
+          const { name, json, quads, sparql: query } = test;
           it(`${name}${blankToVariable ? ' (no blanks)' : ''}`, ({ expect }) => {
             const ast = parser.parse(query);
             const algebra = algebraUtils.objectify(
               toAlgebra(ast, {
-                quads: name.endsWith('-quads'),
+                quads,
                 blankToVariable,
               }),
             );
diff --git a/engines/algebra-sparql-1-2/test/generateJson.test.ts b/engines/algebra-sparql-1-2/test/generateJson.test.ts
index ae9ddde7..f8e061f3 100644
--- a/engines/algebra-sparql-1-2/test/generateJson.test.ts
+++ b/engines/algebra-sparql-1-2/test/generateJson.test.ts
@@ -27,43 +27,46 @@ describe.skip('algebra 1.2 test generate', () => {
   for (const suite of suites) {
     describe(suite, () => {
       for (const { query, name } of sparqlQueries(suite)) {
-        for (const blankToVariable of [ false, true ]) {
-          it(`${name} - blankToVar: ${blankToVariable}`, ({ expect }) => {
-            expect(() => {
-              astFactory.resetBlankNodeCounter();
-              const ast = parser.parse(query, { astFactory });
-              const algebra = algebraUtils.objectify(toAlgebra(ast, {
-                quads: name.endsWith('-quads'),
-                blankToVariable,
-              }));
-              const canonicalString = generator.generate(toAst(algebra));
+        for (const quads of [ false, true ]) {
+          for (const blankToVariable of [ false, true ]) {
+            const suffix = quads ? '-quads' : '';
+            it(`${name}${suffix} - blankToVar: ${blankToVariable}`, ({ expect }) => {
+              expect(() => {
+                astFactory.resetBlankNodeCounter();
+                const ast = parser.parse(query, { astFactory });
+                const algebra = algebraUtils.objectify(toAlgebra(ast, {
+                  quads,
+                  blankToVariable,
+                }));
+                const canonicalString = generator.generate(toAst(algebra));
 
-              const algebraFileName = `${name}.json`;
-              let newPath = blankToVariable ? rootJsonBlankToVariable : rootJson;
-              let newPathCanonical = blankToVariable ? canonicalSparqlBlankToVar : canonicalSparqlBase;
-              for (const piece of name.split(sep).slice(0, -1)) {
-                newPath = join(newPath, piece);
-                if (!existsSync(newPath)) {
-                  mkdirSync(newPath);
+                const algebraFileName = `${name}${suffix}.json`;
+                let newPath = blankToVariable ? rootJsonBlankToVariable : rootJson;
+                let newPathCanonical = blankToVariable ? canonicalSparqlBlankToVar : canonicalSparqlBase;
+                for (const piece of name.split(sep).slice(0, -1)) {
+                  newPath = join(newPath, piece);
+                  if (!existsSync(newPath)) {
+                    mkdirSync(newPath);
+                  }
                 }
-              }
-              for (const piece of name.split(sep).slice(0, -1)) {
-                newPathCanonical = join(newPathCanonical, piece);
-                if (!existsSync(newPathCanonical)) {
-                  mkdirSync(newPathCanonical);
+                for (const piece of name.split(sep).slice(0, -1)) {
+                  newPathCanonical = join(newPathCanonical, piece);
+                  if (!existsSync(newPathCanonical)) {
+                    mkdirSync(newPathCanonical);
+                  }
                 }
-              }
 
-              writeFileSync(
-                join(blankToVariable ? rootJsonBlankToVariable : rootJson, algebraFileName),
-                JSON.stringify(algebra, null, 2),
-              );
-              writeFileSync(
-                join(blankToVariable ? canonicalSparqlBlankToVar : canonicalSparqlBase, `${name}.sparql`),
-                canonicalString,
-              );
-            }).not.toThrow();
-          });
+                writeFileSync(
+                  join(blankToVariable ? rootJsonBlankToVariable : rootJson, algebraFileName),
+                  JSON.stringify(algebra, null, 2),
+                );
+                writeFileSync(
+                  join(blankToVariable ? canonicalSparqlBlankToVar : canonicalSparqlBase, `${name}${suffix}.sparql`),
+                  canonicalString,
+                );
+              }).not.toThrow();
+            });
+          }
         }
       }
     });
diff --git a/packages/algebra-transformations-1-1/lib/toAlgebra/updates.ts b/packages/algebra-transformations-1-1/lib/toAlgebra/updates.ts
index 33979fc3..d19f4926 100644
--- a/packages/algebra-transformations-1-1/lib/toAlgebra/updates.ts
+++ b/packages/algebra-transformations-1-1/lib/toAlgebra/updates.ts
@@ -88,11 +88,7 @@ Algebra.Update,
 [UpdateOperationInsertData | UpdateOperationDeleteData | UpdateOperationDeleteWhere | UpdateOperationModify]
 > = {
   name: 'translateInsertDelete',
-  fun: ({ SUBRULE }) => ({ useQuads, algebraFactory: AF, astFactory: F }, op) => {
-    if (!useQuads) {
-      throw new Error('INSERT/DELETE operations are only supported with quads option enabled');
-    }
-
+  fun: ({ SUBRULE }) => ({ algebraFactory: AF, astFactory: F, useQuads }, op) => {
     const deleteTriples: Algebra.Pattern[] = [];
     const insertTriples: Algebra.Pattern[] = [];
     let where: Algebra.Operation | undefined;
@@ -114,8 +110,11 @@ Algebra.Update,
         if (use.default.length > 0 || use.named.length > 0) {
           where = AF.createFrom(where, use.default, use.named);
         } else if (F.isUpdateOperationModify(op) && op.graph) {
-          // This is equivalent
-          where = SUBRULE(recurseGraph, where, SUBRULE(translateNamed, op.graph), undefined);
+          if (useQuads) {
+            where = SUBRULE(recurseGraph, where, SUBRULE(translateNamed, op.graph), undefined);
+          } else {
+            where = AF.createGraph(where, SUBRULE(translateNamed, op.graph));
+          }
         }
       }
     }
diff --git a/packages/test-utils/lib/generators/algebraGenerators.ts b/packages/test-utils/lib/generators/algebraGenerators.ts
index 96541491..bbef1199 100644
--- a/packages/test-utils/lib/generators/algebraGenerators.ts
+++ b/packages/test-utils/lib/generators/algebraGenerators.ts
@@ -1,5 +1,5 @@
 /* eslint-disable import/no-nodejs-modules */
-import { lstatSync, readdirSync } from 'node:fs';
+import { existsSync, lstatSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { readFile, readFileSync } from '../fileUtils.js';
 import type { NegativeTest } from './generators.js';
@@ -25,6 +25,8 @@ export type AlgebraTestSuite = 'dawg-syntax' | 'sparql-1.1' | 'sparql11-query' |
 /**
  * Yields algebra-level test cases from the static test fixtures.
  * Each test provides a SPARQL query, expected algebra JSON, and optionally a canonical SPARQL string.
+ * For each unique base test name, yields both a `quads: false` and a `quads: true` variant
+ * when the corresponding expected algebra fixture exists.
  * @param suite - The test suite to iterate.
  * @param blankToVariable - Whether to use the blank-to-variable fixture variant.
  * @param getSPARQL - Whether to load the SPARQL and canonical SPARQL strings.
@@ -35,34 +37,57 @@ export function sparqlAlgebraTests(suite: AlgebraTestSuite, blankToVariable: boo
 Generator<algebraTestGen>;
 export function* sparqlAlgebraTests(suite: AlgebraTestSuite, blankToVariable: boolean, getSPARQL: boolean):
 Generator<algebraTestGen> {
-  // Relative path starting from roots declared above.
-  function* subGen(relativePath: string): Generator<algebraTestGen> {
-    const absolutePath = join(blankToVariable ? rootJsonBlankToVariable : rootJson, relativePath);
+  const jsonRoot = blankToVariable ? rootJsonBlankToVariable : rootJson;
+  const canonicalRoot = blankToVariable ? rootCanonicalSparqlBlankToVar : rootCanonicalSparql;
+
+  // Collect all unique base names (relative paths without `-quads` suffix and `.json` extension)
+  // that have a base (non-quads) JSON file
+  function collectBaseNames(relativePath: string, result: Set<string>): void {
+    const absolutePath = join(jsonRoot, relativePath);
     if (lstatSync(absolutePath).isDirectory()) {
-      // Recursion
       for (const sub of readdirSync(absolutePath)) {
-        yield* subGen(join(relativePath, sub));
+        collectBaseNames(join(relativePath, sub), result);
       }
-    } else {
-      const name = relativePath.replace(/\.json$/u, '');
-      const sparqlPath = join(rootSparql, relativePath.replace(/\.json/u, '.sparql'));
-      const canonicalSparqlPath = join(
-        blankToVariable ? rootCanonicalSparqlBlankToVar : rootCanonicalSparql,
-        relativePath.replace(/\.json/u, '.sparql'),
-      );
+    } else if (!relativePath.endsWith('-quads.json')) {
+      result.add(relativePath.replace(/\.json$/u, ''));
+    }
+  }
+
+  function* yieldForBase(baseName: string): Generator<algebraTestGen> {
+    const quadsJsonPath = join(jsonRoot, `${baseName}-quads.json`);
+    const sparqlPath = join(rootSparql, `${baseName}.sparql`);
+    const canonicalPath = join(canonicalRoot, `${baseName}.sparql`);
+
+    // Yield quads: false variant (base JSON always exists since collectBaseNames filters for it)
+    yield {
+      name: baseName,
+      json: JSON.parse(readFileSync(join(jsonRoot, `${baseName}.json`))),
+      quads: false,
+      sparql: getSPARQL ? readFileSync(sparqlPath, 'utf-8') : undefined,
+      canonicalSparql: getSPARQL ? readFileSync(canonicalPath, 'utf-8') : undefined,
+    };
+
+    // Yield quads: true variant if the quads JSON exists
+    if (existsSync(quadsJsonPath)) {
+      const canonicalQuadsPath = join(canonicalRoot, `${baseName}-quads.sparql`);
       yield {
-        name,
-        json: JSON.parse(readFileSync(absolutePath)),
-        sparql: getSPARQL ? readFileSync(sparqlPath, 'utf8') : undefined,
-        canonicalSparql: getSPARQL ? readFileSync(canonicalSparqlPath, 'utf-8') : undefined,
-        quads: name.endsWith('-quads'),
+        name: `${baseName}-quads`,
+        json: JSON.parse(readFileSync(quadsJsonPath)),
+        quads: true,
+        sparql: getSPARQL ? readFileSync(sparqlPath, 'utf-8') : undefined,
+        canonicalSparql: getSPARQL ? readFileSync(canonicalQuadsPath, 'utf-8') : undefined,
       };
     }
   }
 
-  const subfolders = readdirSync(blankToVariable ? rootJsonBlankToVariable : rootJson);
+  const subfolders = readdirSync(jsonRoot);
   if (subfolders.includes(suite)) {
-    yield* subGen(suite);
+    const baseNames = new Set<string>();
+    collectBaseNames(suite, baseNames);
+    const sorted = [ ...baseNames ].sort();
+    for (const baseName of sorted) {
+      yield* yieldForBase(baseName);
+    }
   }
 }
 
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-02.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-02.json
new file mode 100644
index 00000000..07927ef9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-02.json
@@ -0,0 +1,84 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g1"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "graph",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://xmlns.com/foaf/0.1/knows"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "name": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g1"
+      }
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example.org/g2"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/insert-blank-where.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/insert-blank-where.json
new file mode 100644
index 00000000..a05bb85b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/insert-blank-where.json
@@ -0,0 +1,50 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "class"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/2000/01/rdf-schema#Class"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "class"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/insert-blanks.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/insert-blanks.json
new file mode 100644
index 00000000..bb0ac897
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/insert-blanks.json
@@ -0,0 +1,53 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_b"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/title"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "A new book",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_b"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/creator"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "A.N.Other",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-1-1-1.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-1-1-1.json
new file mode 100644
index 00000000..826a58c6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-1-1-1.json
@@ -0,0 +1,29 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/egbook"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/title"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "This is an example title",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-1a.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-1a.json
new file mode 100644
index 00000000..412b1720
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-1a.json
@@ -0,0 +1,53 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/title"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "A new book",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/creator"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "A.N.Other",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-1b.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-1b.json
new file mode 100644
index 00000000..9512517e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-1b.json
@@ -0,0 +1,29 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/ns#price"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "42",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#integer"
+        }
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/bookStore"
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-2a.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-2a.json
new file mode 100644
index 00000000..694c57f7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-2a.json
@@ -0,0 +1,53 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/title"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "David Copperfield",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/creator"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Edmund Wells",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-2b.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-2b.json
new file mode 100644
index 00000000..43cc3e82
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-2b.json
@@ -0,0 +1,63 @@
+{
+  "type": "compositeupdate",
+  "updates": [
+    {
+      "type": "deleteinsert",
+      "delete": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example/book1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/title"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Fundamentals of Compiler Desing",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example/bookStore"
+          }
+        }
+      ]
+    },
+    {
+      "type": "deleteinsert",
+      "insert": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example/book1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/title"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Fundamentals of Compiler Design",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example/bookStore"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-1a.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-1a.json
new file mode 100644
index 00000000..09312f31
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-1a.json
@@ -0,0 +1,100 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "book"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "v"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "book"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/date"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "date"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "book"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "v"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": ">",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "date"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1970-01-01T00:00:00-02:00",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-1b.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-1b.json
new file mode 100644
index 00000000..ea0534fa
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-1b.json
@@ -0,0 +1,81 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "property"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "value"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "person"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "property"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "value"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "person"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/givenName"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Fred",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example/addresses"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2a.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2a.json
new file mode 100644
index 00000000..63f7a007
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2a.json
@@ -0,0 +1,107 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "book"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "v"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/bookStore2"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://purl.org/dc/elements/1.1/date"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "date"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "v"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": ">",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "date"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "1970-01-01T00:00:00-02:00",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example/bookStore"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2b.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2b.json
new file mode 100644
index 00000000..c4165c81
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2b.json
@@ -0,0 +1,107 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/name"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "name"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/mbox"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "email"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "leftjoin",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "person"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://xmlns.com/foaf/0.1/name"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "name"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "person"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://xmlns.com/foaf/0.1/mbox"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "email"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example/people"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2c.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2c.json
new file mode 100644
index 00000000..eb55473d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-2c.json
@@ -0,0 +1,239 @@
+{
+  "type": "compositeupdate",
+  "updates": [
+    {
+      "type": "deleteinsert",
+      "insert": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "book"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "v"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example/bookStore2"
+          }
+        }
+      ],
+      "where": {
+        "type": "graph",
+        "input": {
+          "type": "filter",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://purl.org/dc/elements/1.1/date"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "date"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              },
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "v"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "<",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "date"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Literal",
+                  "value": "2000-01-01T00:00:00-02:00",
+                  "datatype": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+                  }
+                }
+              }
+            ]
+          }
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example/bookStore"
+        }
+      }
+    },
+    {
+      "type": "deleteinsert",
+      "delete": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "book"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "v"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example/bookStore"
+          }
+        }
+      ],
+      "where": {
+        "type": "graph",
+        "input": {
+          "type": "filter",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://purl.org/dc/elements/1.1/date"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "date"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              },
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://purl.org/dc/elements/1.1/type"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://purl.org/dc/dcmitype/PhysicalObject"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              },
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "v"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "<",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "date"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Literal",
+                  "value": "2000-01-01T00:00:00-02:00",
+                  "datatype": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+                  }
+                }
+              }
+            ]
+          }
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example/bookStore"
+        }
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-3a.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-3a.json
new file mode 100644
index 00000000..347f3ce7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-3a.json
@@ -0,0 +1,98 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/givenName"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Fred",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "property"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "value"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/givenName"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Fred",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "property"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "value"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-3b.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-3b.json
new file mode 100644
index 00000000..e53c1c54
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3-3b.json
@@ -0,0 +1,138 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/givenName"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Fred",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.com/names"
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "property1"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "value1"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.com/names"
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "property2"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "value2"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.com/addresses"
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/givenName"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Fred",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.com/names"
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "property1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "value1"
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.com/names"
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "property2"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "value2"
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.com/addresses"
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3.json
new file mode 100644
index 00000000..47e9c70d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-1-3.json
@@ -0,0 +1,91 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/givenName"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Bill",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    }
+  ],
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/givenName"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "William",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "person"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/givenName"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Bill",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example/addresses"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-4-2-4.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-4-2-4.json
new file mode 100644
index 00000000..1fb84ff3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-4-2-4.json
@@ -0,0 +1,68 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "O"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "S"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "isblank",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "S"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/using.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/using.json
new file mode 100644
index 00000000..be69e298
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/using.json
@@ -0,0 +1,65 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "foo:bar"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "urn:one:graph"
+      }
+    }
+  ],
+  "where": {
+    "type": "from",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "foo:bar"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "default": [
+      {
+        "termType": "NamedNode",
+        "value": "urn:another:graph"
+      }
+    ],
+    "named": [
+      {
+        "termType": "NamedNode",
+        "value": "urn:anamed:graph"
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-01.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-01.json
new file mode 100644
index 00000000..cf342069
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-01.json
@@ -0,0 +1,61 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-02.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-02.json
new file mode 100644
index 00000000..9fdecef4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-02.json
@@ -0,0 +1,81 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#y"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-03.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-03.json
new file mode 100644
index 00000000..bb8cc58f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-03.json
@@ -0,0 +1,234 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "g_2"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-04.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-04.json
new file mode 100644
index 00000000..3362713f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-04.json
@@ -0,0 +1,306 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "BlankNode",
+        "value": "g_2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_4"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "g_3"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_5"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p1"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "Z"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_4"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_5"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-05.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-05.json
new file mode 100644
index 00000000..e7617aaf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-05.json
@@ -0,0 +1,234 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "O"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "S"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "g_2"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-06.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-06.json
new file mode 100644
index 00000000..164dc3cb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-06.json
@@ -0,0 +1,130 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#r"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#r"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#added"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Property :r",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#q"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-01.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-01.json
new file mode 100644
index 00000000..aa685c39
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-01.json
@@ -0,0 +1,61 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-02.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-02.json
new file mode 100644
index 00000000..f7a9d03c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-02.json
@@ -0,0 +1,81 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#y"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-03.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-03.json
new file mode 100644
index 00000000..be910712
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-03.json
@@ -0,0 +1,234 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-04.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-04.json
new file mode 100644
index 00000000..b1256825
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-04.json
@@ -0,0 +1,306 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_bnode"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_bnode"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_bnode"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_bnode"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_bnode"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "e_bnode"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p1"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "Z"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-05.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-05.json
new file mode 100644
index 00000000..a473f95c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-05.json
@@ -0,0 +1,234 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "O"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "S"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-06.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-06.json
new file mode 100644
index 00000000..f20606c3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-06.json
@@ -0,0 +1,130 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#r"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#r"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#added"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Property :r",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#q"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-07.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-07.json
new file mode 100644
index 00000000..1a9c10f2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-07.json
@@ -0,0 +1,180 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#r"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#r"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#added"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Property :r",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#iri"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+            },
+            "object": {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.com/ns#p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "path",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "type": "OneOrMorePath",
+          "path": {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#q1"
+            }
+          }
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "ABC",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-08.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-08.json
new file mode 100644
index 00000000..7afee6ed
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-08.json
@@ -0,0 +1,175 @@
+{
+  "type": "compositeupdate",
+  "updates": [
+    {
+      "type": "deleteinsert",
+      "delete": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#p"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#added"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Test",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    {
+      "type": "deleteinsert",
+      "insert": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o2"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#p"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#o2"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#added"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Test",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-01.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-01.json
new file mode 100644
index 00000000..1fa27c58
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-01.json
@@ -0,0 +1,41 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-03.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-03.json
new file mode 100644
index 00000000..7aa579f3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-03.json
@@ -0,0 +1,226 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-04.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-04.json
new file mode 100644
index 00000000..585d363a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-04.json
@@ -0,0 +1,258 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p1"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "Z"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-05.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-05.json
new file mode 100644
index 00000000..642d58a7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-05.json
@@ -0,0 +1,226 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "O"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "S"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#b"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "O"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-02.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-02.json
new file mode 100644
index 00000000..07927ef9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-02.json
@@ -0,0 +1,84 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g1"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "graph",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://xmlns.com/foaf/0.1/knows"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "name": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g1"
+      }
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example.org/g2"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/insert-blank-where.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/insert-blank-where.json
new file mode 100644
index 00000000..b6cb97b1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/insert-blank-where.json
@@ -0,0 +1,50 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "class"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/2000/01/rdf-schema#Class"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "class"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/insert-blanks.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/insert-blanks.json
new file mode 100644
index 00000000..bb0ac897
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/insert-blanks.json
@@ -0,0 +1,53 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_b"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/title"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "A new book",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_b"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/creator"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "A.N.Other",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-1-1-1.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-1-1-1.json
new file mode 100644
index 00000000..826a58c6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-1-1-1.json
@@ -0,0 +1,29 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/egbook"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/title"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "This is an example title",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-1a.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-1a.json
new file mode 100644
index 00000000..412b1720
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-1a.json
@@ -0,0 +1,53 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/title"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "A new book",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/creator"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "A.N.Other",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-1b.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-1b.json
new file mode 100644
index 00000000..9512517e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-1b.json
@@ -0,0 +1,29 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/ns#price"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "42",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#integer"
+        }
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/bookStore"
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-2a.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-2a.json
new file mode 100644
index 00000000..694c57f7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-2a.json
@@ -0,0 +1,53 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/title"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "David Copperfield",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example/book2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://purl.org/dc/elements/1.1/creator"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Edmund Wells",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-2b.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-2b.json
new file mode 100644
index 00000000..43cc3e82
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-2b.json
@@ -0,0 +1,63 @@
+{
+  "type": "compositeupdate",
+  "updates": [
+    {
+      "type": "deleteinsert",
+      "delete": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example/book1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/title"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Fundamentals of Compiler Desing",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example/bookStore"
+          }
+        }
+      ]
+    },
+    {
+      "type": "deleteinsert",
+      "insert": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example/book1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/title"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Fundamentals of Compiler Design",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example/bookStore"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-1a.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-1a.json
new file mode 100644
index 00000000..09312f31
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-1a.json
@@ -0,0 +1,100 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "book"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "v"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "book"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/date"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "date"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "book"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "v"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": ">",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "date"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1970-01-01T00:00:00-02:00",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-1b.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-1b.json
new file mode 100644
index 00000000..ea0534fa
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-1b.json
@@ -0,0 +1,81 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "property"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "value"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "person"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "property"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "value"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "person"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/givenName"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Fred",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example/addresses"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2a.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2a.json
new file mode 100644
index 00000000..63f7a007
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2a.json
@@ -0,0 +1,107 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "book"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "v"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/bookStore2"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://purl.org/dc/elements/1.1/date"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "date"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "v"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": ">",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "date"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "1970-01-01T00:00:00-02:00",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example/bookStore"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2b.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2b.json
new file mode 100644
index 00000000..c4165c81
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2b.json
@@ -0,0 +1,107 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/name"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "name"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/mbox"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "email"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "leftjoin",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "person"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://xmlns.com/foaf/0.1/name"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "name"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "person"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://xmlns.com/foaf/0.1/mbox"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "email"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example/people"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2c.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2c.json
new file mode 100644
index 00000000..eb55473d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-2c.json
@@ -0,0 +1,239 @@
+{
+  "type": "compositeupdate",
+  "updates": [
+    {
+      "type": "deleteinsert",
+      "insert": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "book"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "v"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example/bookStore2"
+          }
+        }
+      ],
+      "where": {
+        "type": "graph",
+        "input": {
+          "type": "filter",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://purl.org/dc/elements/1.1/date"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "date"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              },
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "v"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "<",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "date"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Literal",
+                  "value": "2000-01-01T00:00:00-02:00",
+                  "datatype": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+                  }
+                }
+              }
+            ]
+          }
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example/bookStore"
+        }
+      }
+    },
+    {
+      "type": "deleteinsert",
+      "delete": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "book"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "v"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example/bookStore"
+          }
+        }
+      ],
+      "where": {
+        "type": "graph",
+        "input": {
+          "type": "filter",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://purl.org/dc/elements/1.1/date"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "date"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              },
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://purl.org/dc/elements/1.1/type"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://purl.org/dc/dcmitype/PhysicalObject"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              },
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "book"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "v"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "<",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "date"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Literal",
+                  "value": "2000-01-01T00:00:00-02:00",
+                  "datatype": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+                  }
+                }
+              }
+            ]
+          }
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example/bookStore"
+        }
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-3a.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-3a.json
new file mode 100644
index 00000000..347f3ce7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-3a.json
@@ -0,0 +1,98 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/givenName"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Fred",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "property"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "value"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/givenName"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Fred",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "property"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "value"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-3b.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-3b.json
new file mode 100644
index 00000000..e53c1c54
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3-3b.json
@@ -0,0 +1,138 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/givenName"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Fred",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.com/names"
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "property1"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "value1"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.com/names"
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "property2"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "value2"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.com/addresses"
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/givenName"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Fred",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.com/names"
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "property1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "value1"
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.com/names"
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "property2"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "value2"
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.com/addresses"
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3.json
new file mode 100644
index 00000000..47e9c70d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-1-3.json
@@ -0,0 +1,91 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/givenName"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Bill",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    }
+  ],
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "person"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://xmlns.com/foaf/0.1/givenName"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "William",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example/addresses"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "person"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/givenName"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Bill",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example/addresses"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-4-2-4.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-4-2-4.json
new file mode 100644
index 00000000..1fb84ff3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-4-2-4.json
@@ -0,0 +1,68 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "O"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "S"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "isblank",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "S"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/using.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/using.json
new file mode 100644
index 00000000..be69e298
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/using.json
@@ -0,0 +1,65 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "foo:bar"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "urn:one:graph"
+      }
+    }
+  ],
+  "where": {
+    "type": "from",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "foo:bar"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "default": [
+      {
+        "termType": "NamedNode",
+        "value": "urn:another:graph"
+      }
+    ],
+    "named": [
+      {
+        "termType": "NamedNode",
+        "value": "urn:anamed:graph"
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-01.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-01.json
new file mode 100644
index 00000000..cf342069
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-01.json
@@ -0,0 +1,61 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-02.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-02.json
new file mode 100644
index 00000000..9fdecef4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-02.json
@@ -0,0 +1,81 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#y"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-03.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-03.json
new file mode 100644
index 00000000..25fa2b5d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-03.json
@@ -0,0 +1,234 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "BlankNode",
+            "value": "g_2"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-04.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-04.json
new file mode 100644
index 00000000..2882becc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-04.json
@@ -0,0 +1,306 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "BlankNode",
+        "value": "g_2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_4"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "BlankNode",
+            "value": "g_3"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_5"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p1"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "Z"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_4"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_5"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-05.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-05.json
new file mode 100644
index 00000000..057dfd5f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-05.json
@@ -0,0 +1,234 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "O"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_1"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "S"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "BlankNode",
+            "value": "g_2"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-06.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-06.json
new file mode 100644
index 00000000..164dc3cb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-anonreifier-06.json
@@ -0,0 +1,130 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#r"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#r"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#added"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Property :r",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#q"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-01.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-01.json
new file mode 100644
index 00000000..aa685c39
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-01.json
@@ -0,0 +1,61 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-02.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-02.json
new file mode 100644
index 00000000..f7a9d03c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-02.json
@@ -0,0 +1,81 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#y"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-03.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-03.json
new file mode 100644
index 00000000..066570d8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-03.json
@@ -0,0 +1,234 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-04.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-04.json
new file mode 100644
index 00000000..9e82861d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-04.json
@@ -0,0 +1,306 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_bnode"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_bnode"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_bnode"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_bnode"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_bnode"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "BlankNode",
+            "value": "e_bnode"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p1"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "Z"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-05.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-05.json
new file mode 100644
index 00000000..db8a059a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-05.json
@@ -0,0 +1,234 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "O"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "S"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-06.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-06.json
new file mode 100644
index 00000000..f20606c3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-06.json
@@ -0,0 +1,130 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#r"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#r"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#added"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Property :r",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#q"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-07.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-07.json
new file mode 100644
index 00000000..1a9c10f2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-07.json
@@ -0,0 +1,180 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#r"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#r"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#iri"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#added"
+      },
+      "object": {
+        "termType": "Literal",
+        "value": "Property :r",
+        "datatype": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/2001/XMLSchema#string"
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#iri"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+            },
+            "object": {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.com/ns#p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "path",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#iri"
+        },
+        "predicate": {
+          "type": "OneOrMorePath",
+          "path": {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#q1"
+            }
+          }
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "ABC",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-08.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-08.json
new file mode 100644
index 00000000..7afee6ed
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-reifier-08.json
@@ -0,0 +1,175 @@
+{
+  "type": "compositeupdate",
+  "updates": [
+    {
+      "type": "deleteinsert",
+      "delete": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#p"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#added"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Test",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    {
+      "type": "deleteinsert",
+      "insert": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#o2"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#p"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#o2"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#iri"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#added"
+          },
+          "object": {
+            "termType": "Literal",
+            "value": "Test",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-01.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-01.json
new file mode 100644
index 00000000..1fa27c58
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-01.json
@@ -0,0 +1,41 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#s"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#p"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-03.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-03.json
new file mode 100644
index 00000000..d351bc86
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-03.json
@@ -0,0 +1,226 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-04.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-04.json
new file mode 100644
index 00000000..c2a1388a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-04.json
@@ -0,0 +1,258 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.com/ns#s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#s1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#c"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#s1"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#p1"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "Z"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-05.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-05.json
new file mode 100644
index 00000000..378d287c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-syntax-update-tripleterm-05.json
@@ -0,0 +1,226 @@
+{
+  "type": "deleteinsert",
+  "insert": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "S"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "P"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "O"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+      },
+      "object": {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "g_0"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Z"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "S"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "P"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/ns#b"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "O"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies"
+        },
+        "object": {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "S"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "P"
+          },
+          "object": {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/ns#b"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "O"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "Y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "Z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-02.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-02.sparql
new file mode 100644
index 00000000..090e0c94
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-02.sparql
@@ -0,0 +1,13 @@
+DELETE {
+  GRAPH <http://example.org/g1> {
+    ?s ?p ?o .
+  }
+}
+WHERE {
+  GRAPH <http://example.org/g2> {
+    GRAPH <http://example.org/g1> {
+      <http://example.org/a> <http://xmlns.com/foaf/0.1/knows> ?s .
+      ?s ?p ?o .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/insert-blank-where.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/insert-blank-where.sparql
new file mode 100644
index 00000000..b2ca0374
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/insert-blank-where.sparql
@@ -0,0 +1,6 @@
+INSERT {
+  ?class <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+}
+WHERE {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?class .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/insert-blanks.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/insert-blanks.sparql
new file mode 100644
index 00000000..15301091
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/insert-blanks.sparql
@@ -0,0 +1,4 @@
+INSERT DATA {
+  _:e_b <http://purl.org/dc/elements/1.1/title> "A new book"^^<http://www.w3.org/2001/XMLSchema#string> .
+  _:e_b <http://purl.org/dc/elements/1.1/creator> "A.N.Other"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-1-1-1.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-1-1-1.sparql
new file mode 100644
index 00000000..9b4212ef
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-1-1-1.sparql
@@ -0,0 +1,3 @@
+INSERT DATA {
+  <http://example/egbook> <http://purl.org/dc/elements/1.1/title> "This is an example title"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-1a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-1a.sparql
new file mode 100644
index 00000000..5edc7f23
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-1a.sparql
@@ -0,0 +1,4 @@
+INSERT DATA {
+  <http://example/book1> <http://purl.org/dc/elements/1.1/title> "A new book"^^<http://www.w3.org/2001/XMLSchema#string> .
+  <http://example/book1> <http://purl.org/dc/elements/1.1/creator> "A.N.Other"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-1b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-1b.sparql
new file mode 100644
index 00000000..9e847988
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-1b.sparql
@@ -0,0 +1,5 @@
+INSERT DATA {
+  GRAPH <http://example/bookStore> {
+    <http://example/book1> <http://example.org/ns#price> "42"^^<http://www.w3.org/2001/XMLSchema#integer> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-2a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-2a.sparql
new file mode 100644
index 00000000..526fa8cd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-2a.sparql
@@ -0,0 +1,4 @@
+DELETE DATA {
+  <http://example/book2> <http://purl.org/dc/elements/1.1/title> "David Copperfield"^^<http://www.w3.org/2001/XMLSchema#string> .
+  <http://example/book2> <http://purl.org/dc/elements/1.1/creator> "Edmund Wells"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-2b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-2b.sparql
new file mode 100644
index 00000000..a51d1de7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-2b.sparql
@@ -0,0 +1,11 @@
+DELETE DATA {
+  GRAPH <http://example/bookStore> {
+    <http://example/book1> <http://purl.org/dc/elements/1.1/title> "Fundamentals of Compiler Desing"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
+;
+INSERT DATA {
+  GRAPH <http://example/bookStore> {
+    <http://example/book1> <http://purl.org/dc/elements/1.1/title> "Fundamentals of Compiler Design"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-1a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-1a.sparql
new file mode 100644
index 00000000..14965e5b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-1a.sparql
@@ -0,0 +1,8 @@
+DELETE {
+  ?book ?p ?v .
+}
+WHERE {
+  ?book <http://purl.org/dc/elements/1.1/date> ?date .
+  ?book ?p ?v .
+  FILTER ( ( ?date > "1970-01-01T00:00:00-02:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-1b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-1b.sparql
new file mode 100644
index 00000000..1a97423b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-1b.sparql
@@ -0,0 +1,11 @@
+DELETE {
+  GRAPH <http://example/addresses> {
+    ?person ?property ?value .
+  }
+}
+WHERE {
+  GRAPH <http://example/addresses> {
+    ?person ?property ?value .
+    ?person <http://xmlns.com/foaf/0.1/givenName> "Fred"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2a.sparql
new file mode 100644
index 00000000..e22fdcb0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2a.sparql
@@ -0,0 +1,14 @@
+INSERT {
+  GRAPH <http://example/bookStore2> {
+    ?book ?p ?v .
+  }
+}
+WHERE {
+  GRAPH <http://example/bookStore> {
+    {
+      ?book <http://purl.org/dc/elements/1.1/date> ?date .
+      ?book ?p ?v .
+      FILTER ( ( ?date > "1970-01-01T00:00:00-02:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ) )
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2b.sparql
new file mode 100644
index 00000000..82973dff
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2b.sparql
@@ -0,0 +1,14 @@
+INSERT {
+  GRAPH <http://example/addresses> {
+    ?person <http://xmlns.com/foaf/0.1/name> ?name .
+    ?person <http://xmlns.com/foaf/0.1/mbox> ?email .
+  }
+}
+WHERE {
+  GRAPH <http://example/people> {
+    ?person <http://xmlns.com/foaf/0.1/name> ?name .
+    OPTIONAL {
+      ?person <http://xmlns.com/foaf/0.1/mbox> ?email .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2c.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2c.sparql
new file mode 100644
index 00000000..5f005ae8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-2c.sparql
@@ -0,0 +1,30 @@
+INSERT {
+  GRAPH <http://example/bookStore2> {
+    ?book ?p ?v .
+  }
+}
+WHERE {
+  GRAPH <http://example/bookStore> {
+    {
+      ?book <http://purl.org/dc/elements/1.1/date> ?date .
+      ?book ?p ?v .
+      FILTER ( ( ?date < "2000-01-01T00:00:00-02:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ) )
+    }
+  }
+}
+;
+DELETE {
+  GRAPH <http://example/bookStore> {
+    ?book ?p ?v .
+  }
+}
+WHERE {
+  GRAPH <http://example/bookStore> {
+    {
+      ?book <http://purl.org/dc/elements/1.1/date> ?date .
+      ?book <http://purl.org/dc/elements/1.1/type> <http://purl.org/dc/dcmitype/PhysicalObject> .
+      ?book ?p ?v .
+      FILTER ( ( ?date < "2000-01-01T00:00:00-02:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ) )
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-3a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-3a.sparql
new file mode 100644
index 00000000..7dcd2f1b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-3a.sparql
@@ -0,0 +1,4 @@
+DELETE WHERE {
+  ?person <http://xmlns.com/foaf/0.1/givenName> "Fred"^^<http://www.w3.org/2001/XMLSchema#string> .
+  ?person ?property ?value .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-3b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-3b.sparql
new file mode 100644
index 00000000..444a05b1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3-3b.sparql
@@ -0,0 +1,9 @@
+DELETE WHERE {
+  GRAPH <http://example.com/names> {
+    ?person <http://xmlns.com/foaf/0.1/givenName> "Fred"^^<http://www.w3.org/2001/XMLSchema#string> .
+    ?person ?property1 ?value1 .
+  }
+  GRAPH <http://example.com/addresses> {
+    ?person ?property2 ?value2 .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3.sparql
new file mode 100644
index 00000000..c061e35c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-1-3.sparql
@@ -0,0 +1,15 @@
+DELETE {
+  GRAPH <http://example/addresses> {
+    ?person <http://xmlns.com/foaf/0.1/givenName> "Bill"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
+INSERT {
+  GRAPH <http://example/addresses> {
+    ?person <http://xmlns.com/foaf/0.1/givenName> "William"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
+WHERE {
+  GRAPH <http://example/addresses> {
+    ?person <http://xmlns.com/foaf/0.1/givenName> "Bill"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-4-2-4.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-4-2-4.sparql
new file mode 100644
index 00000000..3fc0ff94
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-4-2-4.sparql
@@ -0,0 +1,7 @@
+DELETE {
+  ?S ?P ?O .
+}
+WHERE {
+  ?S ?P ?O .
+  FILTER ( ISBLANK( ?S ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/using.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/using.sparql
new file mode 100644
index 00000000..e52f22a5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/using.sparql
@@ -0,0 +1,8 @@
+DELETE {
+  GRAPH <urn:one:graph> {
+    ?s <foo:bar> ?o .
+  }
+}
+USING <urn:another:graph> USING NAMED <urn:anamed:graph> WHERE {
+  ?s <foo:bar> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql
new file mode 100644
index 00000000..f918d4b7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql
@@ -0,0 +1,4 @@
+INSERT DATA {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 <http://example.com/ns#p> <http://example.com/ns#o> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql
new file mode 100644
index 00000000..301015ad
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql
@@ -0,0 +1,5 @@
+INSERT DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o> )>> .
+  _:g_0 <http://example.com/ns#y> <http://example.com/ns#z> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql
new file mode 100644
index 00000000..3add5c3c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql
@@ -0,0 +1,12 @@
+INSERT {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 ?P <http://example.com/ns#o2> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:g_0 ?P <http://example.com/ns#o2> )>> .
+  _:g_1 ?Y ?Z .
+}
+WHERE {
+  _:g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_2 ?P <http://example.com/ns#o1> .
+  _:g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:g_2 ?P <http://example.com/ns#o1> )>> .
+  _:g_3 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql
new file mode 100644
index 00000000..a81b2da9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql
@@ -0,0 +1,14 @@
+INSERT {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 ?P <http://example.com/ns#o2> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:g_0 ?P <http://example.com/ns#o2> )>> .
+  _:g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+  _:g_1 ?Y _:g_2 .
+}
+WHERE {
+  _:g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_3 ?P <http://example.com/ns#o1> .
+  _:g_4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:g_3 ?P <http://example.com/ns#o1> )>> .
+  _:g_5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+  _:g_4 ?Y _:g_5 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql
new file mode 100644
index 00000000..613bfd52
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql
@@ -0,0 +1,12 @@
+INSERT {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  ?S ?P _:g_0 .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P _:g_0 )>> .
+  _:g_1 ?Y ?Z .
+}
+WHERE {
+  _:g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  ?S ?P _:g_2 .
+  _:g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P _:g_2 )>> .
+  _:g_3 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql
new file mode 100644
index 00000000..bf75b06a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql
@@ -0,0 +1,9 @@
+INSERT {
+  ?s <http://example.com/ns#r> ?o .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s <http://example.com/ns#r> ?o )>> .
+  _:g_0 <http://example.com/ns#added> "Property :r"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
+WHERE {
+  ?s <http://example.com/ns#p> ?var0 .
+  ?var0 <http://example.com/ns#q> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-01.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-01.sparql
new file mode 100644
index 00000000..d1315fbf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-01.sparql
@@ -0,0 +1,4 @@
+INSERT DATA {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#p> <http://example.com/ns#o> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-02.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-02.sparql
new file mode 100644
index 00000000..fc1c4294
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-02.sparql
@@ -0,0 +1,5 @@
+INSERT DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o> )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#y> <http://example.com/ns#z> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-03.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-03.sparql
new file mode 100644
index 00000000..3571173f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-03.sparql
@@ -0,0 +1,12 @@
+INSERT {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  <http://example.com/ns#iri> ?P <http://example.com/ns#o2> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#iri> ?P <http://example.com/ns#o2> )>> .
+  _:g_0 ?Y ?Z .
+}
+WHERE {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  <http://example.com/ns#iri> ?P <http://example.com/ns#o1> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#iri> ?P <http://example.com/ns#o1> )>> .
+  _:g_1 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-04.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-04.sparql
new file mode 100644
index 00000000..cf4aa567
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-04.sparql
@@ -0,0 +1,14 @@
+INSERT {
+  _:e_bnode <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:e_bnode ?P <http://example.com/ns#o2> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:e_bnode ?P <http://example.com/ns#o2> )>> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+  _:g_0 ?Y <http://example.com/ns#iri> .
+}
+WHERE {
+  _:e_bnode <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:e_bnode ?P <http://example.com/ns#o1> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:e_bnode ?P <http://example.com/ns#o1> )>> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+  _:g_1 ?Y <http://example.com/ns#iri> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-05.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-05.sparql
new file mode 100644
index 00000000..911a22dd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-05.sparql
@@ -0,0 +1,12 @@
+INSERT {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  ?S ?P <http://example.com/ns#iri> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <http://example.com/ns#iri> )>> .
+  _:g_0 ?Y ?Z .
+}
+WHERE {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  ?S ?P <http://example.com/ns#iri> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <http://example.com/ns#iri> )>> .
+  _:g_1 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-06.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-06.sparql
new file mode 100644
index 00000000..f02815e5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-06.sparql
@@ -0,0 +1,9 @@
+INSERT {
+  ?s <http://example.com/ns#r> ?o .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s <http://example.com/ns#r> ?o )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#added> "Property :r"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
+WHERE {
+  ?s <http://example.com/ns#p> ?var0 .
+  ?var0 <http://example.com/ns#q> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-07.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-07.sparql
new file mode 100644
index 00000000..03538434
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-07.sparql
@@ -0,0 +1,10 @@
+DELETE {
+  ?s <http://example.com/ns#r> ?o .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s <http://example.com/ns#r> ?o )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#added> "Property :r"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
+WHERE {
+  ?s <http://example.com/ns#p> ?o .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s <http://example.com/ns#p> ?o )>> .
+  <http://example.com/ns#iri> (<http://example.com/ns#q1>+) "ABC"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-08.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-08.sparql
new file mode 100644
index 00000000..36b26b4f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-reifier-08.sparql
@@ -0,0 +1,11 @@
+DELETE DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o1> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o1> )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#added> "Test"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
+;
+INSERT DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o2> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o2> )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#added> "Test"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql
new file mode 100644
index 00000000..e32e57b8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql
@@ -0,0 +1,3 @@
+INSERT DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql
new file mode 100644
index 00000000..1f01b98b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql
@@ -0,0 +1,10 @@
+INSERT {
+  ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> )>> .
+  _:g_0 ?Y ?Z .
+}
+WHERE {
+  <http://example.com/ns#s> ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> )>> .
+  _:g_1 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql
new file mode 100644
index 00000000..61b4f90d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql
@@ -0,0 +1,10 @@
+INSERT {
+  <http://example.com/ns#s> ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> )>> .
+  _:g_0 ?Y <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+}
+WHERE {
+  ?s ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> )>> .
+  _:g_1 ?Y <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql
new file mode 100644
index 00000000..0b98db8a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql
@@ -0,0 +1,10 @@
+INSERT {
+  ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> )>> .
+  _:g_0 ?Y ?Z .
+}
+WHERE {
+  ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> )>> .
+  _:g_1 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-02.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-02.sparql
new file mode 100644
index 00000000..090e0c94
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-02.sparql
@@ -0,0 +1,13 @@
+DELETE {
+  GRAPH <http://example.org/g1> {
+    ?s ?p ?o .
+  }
+}
+WHERE {
+  GRAPH <http://example.org/g2> {
+    GRAPH <http://example.org/g1> {
+      <http://example.org/a> <http://xmlns.com/foaf/0.1/knows> ?s .
+      ?s ?p ?o .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/insert-blank-where.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/insert-blank-where.sparql
new file mode 100644
index 00000000..86ba0fc1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/insert-blank-where.sparql
@@ -0,0 +1,6 @@
+INSERT {
+  ?class <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
+}
+WHERE {
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?class .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/insert-blanks.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/insert-blanks.sparql
new file mode 100644
index 00000000..15301091
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/insert-blanks.sparql
@@ -0,0 +1,4 @@
+INSERT DATA {
+  _:e_b <http://purl.org/dc/elements/1.1/title> "A new book"^^<http://www.w3.org/2001/XMLSchema#string> .
+  _:e_b <http://purl.org/dc/elements/1.1/creator> "A.N.Other"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-1-1-1.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-1-1-1.sparql
new file mode 100644
index 00000000..9b4212ef
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-1-1-1.sparql
@@ -0,0 +1,3 @@
+INSERT DATA {
+  <http://example/egbook> <http://purl.org/dc/elements/1.1/title> "This is an example title"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-1a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-1a.sparql
new file mode 100644
index 00000000..5edc7f23
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-1a.sparql
@@ -0,0 +1,4 @@
+INSERT DATA {
+  <http://example/book1> <http://purl.org/dc/elements/1.1/title> "A new book"^^<http://www.w3.org/2001/XMLSchema#string> .
+  <http://example/book1> <http://purl.org/dc/elements/1.1/creator> "A.N.Other"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-1b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-1b.sparql
new file mode 100644
index 00000000..9e847988
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-1b.sparql
@@ -0,0 +1,5 @@
+INSERT DATA {
+  GRAPH <http://example/bookStore> {
+    <http://example/book1> <http://example.org/ns#price> "42"^^<http://www.w3.org/2001/XMLSchema#integer> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-2a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-2a.sparql
new file mode 100644
index 00000000..526fa8cd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-2a.sparql
@@ -0,0 +1,4 @@
+DELETE DATA {
+  <http://example/book2> <http://purl.org/dc/elements/1.1/title> "David Copperfield"^^<http://www.w3.org/2001/XMLSchema#string> .
+  <http://example/book2> <http://purl.org/dc/elements/1.1/creator> "Edmund Wells"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-2b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-2b.sparql
new file mode 100644
index 00000000..a51d1de7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-2b.sparql
@@ -0,0 +1,11 @@
+DELETE DATA {
+  GRAPH <http://example/bookStore> {
+    <http://example/book1> <http://purl.org/dc/elements/1.1/title> "Fundamentals of Compiler Desing"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
+;
+INSERT DATA {
+  GRAPH <http://example/bookStore> {
+    <http://example/book1> <http://purl.org/dc/elements/1.1/title> "Fundamentals of Compiler Design"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-1a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-1a.sparql
new file mode 100644
index 00000000..14965e5b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-1a.sparql
@@ -0,0 +1,8 @@
+DELETE {
+  ?book ?p ?v .
+}
+WHERE {
+  ?book <http://purl.org/dc/elements/1.1/date> ?date .
+  ?book ?p ?v .
+  FILTER ( ( ?date > "1970-01-01T00:00:00-02:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-1b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-1b.sparql
new file mode 100644
index 00000000..1a97423b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-1b.sparql
@@ -0,0 +1,11 @@
+DELETE {
+  GRAPH <http://example/addresses> {
+    ?person ?property ?value .
+  }
+}
+WHERE {
+  GRAPH <http://example/addresses> {
+    ?person ?property ?value .
+    ?person <http://xmlns.com/foaf/0.1/givenName> "Fred"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2a.sparql
new file mode 100644
index 00000000..e22fdcb0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2a.sparql
@@ -0,0 +1,14 @@
+INSERT {
+  GRAPH <http://example/bookStore2> {
+    ?book ?p ?v .
+  }
+}
+WHERE {
+  GRAPH <http://example/bookStore> {
+    {
+      ?book <http://purl.org/dc/elements/1.1/date> ?date .
+      ?book ?p ?v .
+      FILTER ( ( ?date > "1970-01-01T00:00:00-02:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ) )
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2b.sparql
new file mode 100644
index 00000000..82973dff
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2b.sparql
@@ -0,0 +1,14 @@
+INSERT {
+  GRAPH <http://example/addresses> {
+    ?person <http://xmlns.com/foaf/0.1/name> ?name .
+    ?person <http://xmlns.com/foaf/0.1/mbox> ?email .
+  }
+}
+WHERE {
+  GRAPH <http://example/people> {
+    ?person <http://xmlns.com/foaf/0.1/name> ?name .
+    OPTIONAL {
+      ?person <http://xmlns.com/foaf/0.1/mbox> ?email .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2c.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2c.sparql
new file mode 100644
index 00000000..5f005ae8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-2c.sparql
@@ -0,0 +1,30 @@
+INSERT {
+  GRAPH <http://example/bookStore2> {
+    ?book ?p ?v .
+  }
+}
+WHERE {
+  GRAPH <http://example/bookStore> {
+    {
+      ?book <http://purl.org/dc/elements/1.1/date> ?date .
+      ?book ?p ?v .
+      FILTER ( ( ?date < "2000-01-01T00:00:00-02:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ) )
+    }
+  }
+}
+;
+DELETE {
+  GRAPH <http://example/bookStore> {
+    ?book ?p ?v .
+  }
+}
+WHERE {
+  GRAPH <http://example/bookStore> {
+    {
+      ?book <http://purl.org/dc/elements/1.1/date> ?date .
+      ?book <http://purl.org/dc/elements/1.1/type> <http://purl.org/dc/dcmitype/PhysicalObject> .
+      ?book ?p ?v .
+      FILTER ( ( ?date < "2000-01-01T00:00:00-02:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> ) )
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-3a.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-3a.sparql
new file mode 100644
index 00000000..7dcd2f1b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-3a.sparql
@@ -0,0 +1,4 @@
+DELETE WHERE {
+  ?person <http://xmlns.com/foaf/0.1/givenName> "Fred"^^<http://www.w3.org/2001/XMLSchema#string> .
+  ?person ?property ?value .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-3b.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-3b.sparql
new file mode 100644
index 00000000..444a05b1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3-3b.sparql
@@ -0,0 +1,9 @@
+DELETE WHERE {
+  GRAPH <http://example.com/names> {
+    ?person <http://xmlns.com/foaf/0.1/givenName> "Fred"^^<http://www.w3.org/2001/XMLSchema#string> .
+    ?person ?property1 ?value1 .
+  }
+  GRAPH <http://example.com/addresses> {
+    ?person ?property2 ?value2 .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3.sparql
new file mode 100644
index 00000000..c061e35c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-1-3.sparql
@@ -0,0 +1,15 @@
+DELETE {
+  GRAPH <http://example/addresses> {
+    ?person <http://xmlns.com/foaf/0.1/givenName> "Bill"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
+INSERT {
+  GRAPH <http://example/addresses> {
+    ?person <http://xmlns.com/foaf/0.1/givenName> "William"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
+WHERE {
+  GRAPH <http://example/addresses> {
+    ?person <http://xmlns.com/foaf/0.1/givenName> "Bill"^^<http://www.w3.org/2001/XMLSchema#string> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-4-2-4.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-4-2-4.sparql
new file mode 100644
index 00000000..3fc0ff94
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-4-2-4.sparql
@@ -0,0 +1,7 @@
+DELETE {
+  ?S ?P ?O .
+}
+WHERE {
+  ?S ?P ?O .
+  FILTER ( ISBLANK( ?S ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/using.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/using.sparql
new file mode 100644
index 00000000..e52f22a5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/using.sparql
@@ -0,0 +1,8 @@
+DELETE {
+  GRAPH <urn:one:graph> {
+    ?s <foo:bar> ?o .
+  }
+}
+USING <urn:another:graph> USING NAMED <urn:anamed:graph> WHERE {
+  ?s <foo:bar> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql
new file mode 100644
index 00000000..f918d4b7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql
@@ -0,0 +1,4 @@
+INSERT DATA {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 <http://example.com/ns#p> <http://example.com/ns#o> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql
new file mode 100644
index 00000000..301015ad
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql
@@ -0,0 +1,5 @@
+INSERT DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o> )>> .
+  _:g_0 <http://example.com/ns#y> <http://example.com/ns#z> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql
new file mode 100644
index 00000000..ca54c281
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql
@@ -0,0 +1,12 @@
+INSERT {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 ?P <http://example.com/ns#o2> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:g_0 ?P <http://example.com/ns#o2> )>> .
+  _:g_1 ?Y ?Z .
+}
+WHERE {
+  ?g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  ?g_2 ?P <http://example.com/ns#o1> .
+  ?g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?g_2 ?P <http://example.com/ns#o1> )>> .
+  ?g_3 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql
new file mode 100644
index 00000000..63df43e0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql
@@ -0,0 +1,14 @@
+INSERT {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 ?P <http://example.com/ns#o2> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:g_0 ?P <http://example.com/ns#o2> )>> .
+  _:g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+  _:g_1 ?Y _:g_2 .
+}
+WHERE {
+  ?g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  ?g_3 ?P <http://example.com/ns#o1> .
+  ?g_4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?g_3 ?P <http://example.com/ns#o1> )>> .
+  ?g_5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+  ?g_4 ?Y ?g_5 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql
new file mode 100644
index 00000000..43902238
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql
@@ -0,0 +1,12 @@
+INSERT {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  ?S ?P _:g_0 .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P _:g_0 )>> .
+  _:g_1 ?Y ?Z .
+}
+WHERE {
+  ?g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  ?S ?P ?g_2 .
+  ?g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P ?g_2 )>> .
+  ?g_3 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql
new file mode 100644
index 00000000..bf75b06a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql
@@ -0,0 +1,9 @@
+INSERT {
+  ?s <http://example.com/ns#r> ?o .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s <http://example.com/ns#r> ?o )>> .
+  _:g_0 <http://example.com/ns#added> "Property :r"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
+WHERE {
+  ?s <http://example.com/ns#p> ?var0 .
+  ?var0 <http://example.com/ns#q> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-01.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-01.sparql
new file mode 100644
index 00000000..d1315fbf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-01.sparql
@@ -0,0 +1,4 @@
+INSERT DATA {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#p> <http://example.com/ns#o> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-02.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-02.sparql
new file mode 100644
index 00000000..fc1c4294
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-02.sparql
@@ -0,0 +1,5 @@
+INSERT DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o> )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#y> <http://example.com/ns#z> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-03.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-03.sparql
new file mode 100644
index 00000000..ab6f62ac
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-03.sparql
@@ -0,0 +1,12 @@
+INSERT {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  <http://example.com/ns#iri> ?P <http://example.com/ns#o2> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#iri> ?P <http://example.com/ns#o2> )>> .
+  _:g_0 ?Y ?Z .
+}
+WHERE {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  <http://example.com/ns#iri> ?P <http://example.com/ns#o1> .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#iri> ?P <http://example.com/ns#o1> )>> .
+  ?g_1 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-04.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-04.sparql
new file mode 100644
index 00000000..94690bf3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-04.sparql
@@ -0,0 +1,14 @@
+INSERT {
+  _:e_bnode <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:e_bnode ?P <http://example.com/ns#o2> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:e_bnode ?P <http://example.com/ns#o2> )>> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+  _:g_0 ?Y <http://example.com/ns#iri> .
+}
+WHERE {
+  ?e_bnode <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  ?e_bnode ?P <http://example.com/ns#o1> .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?e_bnode ?P <http://example.com/ns#o1> )>> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+  ?g_1 ?Y <http://example.com/ns#iri> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-05.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-05.sparql
new file mode 100644
index 00000000..cb44964a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-05.sparql
@@ -0,0 +1,12 @@
+INSERT {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  ?S ?P <http://example.com/ns#iri> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <http://example.com/ns#iri> )>> .
+  _:g_0 ?Y ?Z .
+}
+WHERE {
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  ?S ?P <http://example.com/ns#iri> .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <http://example.com/ns#iri> )>> .
+  ?g_1 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-06.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-06.sparql
new file mode 100644
index 00000000..f02815e5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-06.sparql
@@ -0,0 +1,9 @@
+INSERT {
+  ?s <http://example.com/ns#r> ?o .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s <http://example.com/ns#r> ?o )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#added> "Property :r"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
+WHERE {
+  ?s <http://example.com/ns#p> ?var0 .
+  ?var0 <http://example.com/ns#q> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-07.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-07.sparql
new file mode 100644
index 00000000..03538434
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-07.sparql
@@ -0,0 +1,10 @@
+DELETE {
+  ?s <http://example.com/ns#r> ?o .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s <http://example.com/ns#r> ?o )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#added> "Property :r"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
+WHERE {
+  ?s <http://example.com/ns#p> ?o .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s <http://example.com/ns#p> ?o )>> .
+  <http://example.com/ns#iri> (<http://example.com/ns#q1>+) "ABC"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-08.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-08.sparql
new file mode 100644
index 00000000..36b26b4f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-reifier-08.sparql
@@ -0,0 +1,11 @@
+DELETE DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o1> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o1> )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#added> "Test"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
+;
+INSERT DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o2> .
+  <http://example.com/ns#iri> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> <http://example.com/ns#p> <http://example.com/ns#o2> )>> .
+  <http://example.com/ns#iri> <http://example.com/ns#added> "Test"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql
new file mode 100644
index 00000000..e32e57b8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql
@@ -0,0 +1,3 @@
+INSERT DATA {
+  <http://example.com/ns#s> <http://example.com/ns#p> <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql
new file mode 100644
index 00000000..d13319ba
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql
@@ -0,0 +1,10 @@
+INSERT {
+  ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> )>> .
+  _:g_0 ?Y ?Z .
+}
+WHERE {
+  <http://example.com/ns#s> ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> )>> .
+  ?g_1 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql
new file mode 100644
index 00000000..5b131d1c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql
@@ -0,0 +1,10 @@
+INSERT {
+  <http://example.com/ns#s> ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example.com/ns#s> ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> )>> .
+  _:g_0 ?Y <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+}
+WHERE {
+  ?s ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?s ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> <http://example.com/ns#c> )>> )>> .
+  ?g_1 ?Y <<( <http://example.com/ns#s1> <http://example.com/ns#p1> ?Z )>> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql
new file mode 100644
index 00000000..ad57d3ad
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql
@@ -0,0 +1,10 @@
+INSERT {
+  ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> )>> .
+  _:g_0 ?Y ?Z .
+}
+WHERE {
+  ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( ?S ?P <<( <http://example.com/ns#a> <http://example.com/ns#b> ?O )>> )>> .
+  ?g_1 ?Y ?Z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/delete/delete-with-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/delete/delete-with-02.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql-1.1/delete/delete-with-02-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql-1.1/delete/delete-with-02.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/exists/exists-within-graph-pattern-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/exists/exists-within-graph-pattern-quads.sparql
deleted file mode 100644
index 90ce9347..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql-1.1/exists/exists-within-graph-pattern-quads.sparql
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix ex: <http://www.example.org/>
-select * where {
-graph ex:graph {
-    ?s ?p ex:o1
-    filter exists { ?s ?p ex:o2 }
-}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/paths/06-path-with-two-graphs-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/paths/06-path-with-two-graphs-quads.sparql
deleted file mode 100644
index 3fc4b4e7..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql-1.1/paths/06-path-with-two-graphs-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-prefix ex: <http://www.example.org/schema#>
-prefix in: <http://www.example.org/instance#>
-
-select ?x where {
-    graph ?g {in:a ex:p1/ex:p2 ?x}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/service/service-in-graph-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/service/service-in-graph-quads.sparql
deleted file mode 100644
index d666b700..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql-1.1/service/service-in-graph-quads.sparql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT ?p ?s WHERE {
-  GRAPH <http://iam.ucdavis.edu> {
-    SERVICE <http://localhost:3030/experts/sparql> { ?s ?p "foo". } } }
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/service/service-with-graph-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/service/service-with-graph-quads.sparql
deleted file mode 100644
index d5158ef7..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql-1.1/service/service-with-graph-quads.sparql
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT ?p ?s WHERE {
-  SERVICE <http://localhost:3030/experts/sparql>  {
-    GRAPH <http://iam.ucdavis.edu> { ?s ?p "foo". } } }
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/01-subquery-within-graph-pattern-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/01-subquery-within-graph-pattern-quads.sparql
deleted file mode 100644
index d1820a8b..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/01-subquery-within-graph-pattern-quads.sparql
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix ex: <http://www.example.org/schema#>
-prefix in: <http://www.example.org/instance#>
-select ?x ?p where {
-    graph ?g {
-        {select * where {?x ?p ?y}}
-    }
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/02-subquery-within-graph-pattern-graph-variable-is-bound-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/02-subquery-within-graph-pattern-graph-variable-is-bound-quads.sparql
deleted file mode 100644
index 87abb91a..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/02-subquery-within-graph-pattern-graph-variable-is-bound-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-select  ?x ?p where {
-graph ?g {
-{select * where {?x ?p ?g}}
-}
-}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/02b-subquery-within-graph-pattern-graph-variable-is-extended-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/02b-subquery-within-graph-pattern-graph-variable-is-extended-quads.sparql
deleted file mode 100644
index f8b840bd..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/02b-subquery-within-graph-pattern-graph-variable-is-extended-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-select  ?x ?p where {
-graph ?g {
-{select (?x as ?g) where {?x ?p ?g}}
-}
-}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/03-subquery-within-graph-pattern-graph-variable-is-not-bound-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/03-subquery-within-graph-pattern-graph-variable-is-not-bound-quads.sparql
deleted file mode 100644
index ff619983..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/03-subquery-within-graph-pattern-graph-variable-is-not-bound-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-select ?x where {
-graph ?g {
-  {select ?x where {?x ?p ?g}}
-}
-}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/07-subquery-with-from-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/07-subquery-with-from-quads.sparql
deleted file mode 100644
index f42439d3..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql-1.1/subqueries/07-subquery-with-from-quads.sparql
+++ /dev/null
@@ -1,7 +0,0 @@
-prefix ex: <http://www.example.org/schema#>
-prefix in: <http://www.example.org/instance#>
-
-select ?x
-where {
-    {select * where {graph ?g {?x ?p ?y}}}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-aggregate-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-aggregate-quads.sparql
deleted file mode 100644
index b35aa4f5..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-aggregate-quads.sparql
+++ /dev/null
@@ -1 +0,0 @@
-SELECT (COUNT(*) AS ?count) WHERE { GRAPH ?g { ?s ?p ?o. } }
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-join-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-join-quads.sparql
deleted file mode 100644
index db01272b..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-join-quads.sparql
+++ /dev/null
@@ -1,10 +0,0 @@
-SELECT ?s
-WHERE {
-  GRAPH <http://graph.example.com/> {
-    ?s ?p ?o.
-    filter(uri(?s))
-  }
-  GRAPH <http://other.example.com/> {
-    ?s ?p  ?o.
-  }
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-multiple-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-multiple-quads.sparql
deleted file mode 100644
index 50921466..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-multiple-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-SELECT ?hero_graph ?hero_name WHERE {
-  ?b2 <http://example.org/hero> ?hero.
-  GRAPH ?hero_graph {
-    ?hero <http://example.org/name> ?hero_name.
-  }
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-with-path-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-with-path-quads.sparql
deleted file mode 100644
index b50f9ca6..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql11-query/graph-with-path-quads.sparql
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix : <http://example/>
-
-select * where {
-    graph ?g {
-        :a :b ?x.
-        :a (:p/:p)? ?t.
-        ?x :c ?t.
-    }
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/insert-blank-where-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/insert-blank-where.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/insert-blank-where-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/insert-blank-where.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/insert-blanks-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/insert-blanks.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/insert-blanks-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/insert-blanks.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-1-1-1-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-1-1-1.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-1-1-1-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-1-1-1.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-1a-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-1a.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-1a-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-1a.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-1b-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-1b.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-1b-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-1b.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-2a-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-2a.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-2a-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-2a.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-2b-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-2b.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-2b-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-2b.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-1a-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-1a.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-1a-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-1a.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-1b-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-1b.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-1b-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-1b.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2a-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2a.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2a-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2a.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2b-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2b.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2b-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2b.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2c-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2c.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2c-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-2c.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-3a-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-3a.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-3a-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-3a.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-3b-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-3b.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-3b-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-3b.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-3-1-3.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-4-2-4-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-4-2-4.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-4-2-4-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/sparql-update-4-2-4.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql11-query/update/using-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql11-query/update/using.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql11-query/update/using-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql11-query/update/using.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-01-quads.sparql
deleted file mode 100644
index efe35adb..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o {| :r ?Z |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-02-quads.sparql
deleted file mode 100644
index e06599fd..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-02-quads.sparql
+++ /dev/null
@@ -1,12 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   :s :p :o {| :source [ :graph <http://host1/> ;
-                         :date "2020-01-20"^^xsd:date
-                       ] ;
-               ?source [ :graph <http://host2/> ;
-                         :date "2020-12-31"^^xsd:date
-                       ]
-             |}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-03-quads.sparql
deleted file mode 100644
index b1b7a91d..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-03-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   :s :p <<:a :b :c>> {| ?q ?z |}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-04-quads.sparql
deleted file mode 100644
index 7d39ec1e..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-04-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   :s :p <<:a :b :c>> {| ?q <<:s1 :p1 ?z>> |}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-05-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-05-quads.sparql
deleted file mode 100644
index 638804da..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-05-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   <<?s :p1 :o1>> ?p ?o {| :r ?Z |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-06-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-06-quads.sparql
deleted file mode 100644
index cad28149..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-06-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o {| :r/:q 'ABC' |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-07-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-07-quads.sparql
deleted file mode 100644
index c6bb787e..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-07-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o {| :r [ :p1|:p2 'ABC'] |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-08-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-08-quads.sparql
deleted file mode 100644
index e8af673c..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-08-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT {
-      ?s ?p ?o {| :source ?g |}
-}
-WHERE { GRAPH ?g { ?s ?p ?o } }
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-09-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-09-quads.sparql
deleted file mode 100644
index 2694e566..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-09-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s :p ?o {| :q1 ?z |} 
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-01-quads.sparql
deleted file mode 100644
index ee64e8c5..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s :p ?o {| :r1 ?Z1 |} {| :r2 ?Z2 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-02-quads.sparql
deleted file mode 100644
index 60cbcae6..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o {| :r1 ?Z1 |} {| :r2 ?Z2 |} {| :r3 ?Z3 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-03-quads.sparql
deleted file mode 100644
index 50ec7430..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-03-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s :p ?o {| :r1 ?Z1 |} {| :r2 ?Z2 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-04-quads.sparql
deleted file mode 100644
index 73922f07..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-anonreifier-multiple-04-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s ?p ?o {| :r1 ?Z1 |} {| :r2 ?Z2 |} {| :r3 ?Z3 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-01-quads.sparql
deleted file mode 100644
index 072d4249..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o ~ :iri {| :r ?Z |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-02-quads.sparql
deleted file mode 100644
index a658edd5..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-02-quads.sparql
+++ /dev/null
@@ -1,12 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   :s :p :o  ~ :iri {| :source [ :graph <http://host1/> ;
-                         :date "2020-01-20"^^xsd:date
-                       ] ;
-                       ?source [ :graph <http://host2/> ;
-                         :date "2020-12-31"^^xsd:date
-                       ]
-                    |}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-03-quads.sparql
deleted file mode 100644
index d1a62bef..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-03-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   :s :p <<:a :b :c>>  ~ _:bnode {| ?q ?z |}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-04-quads.sparql
deleted file mode 100644
index 5b2701e9..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-04-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   :s :p <<:a :b :c>> ~ :iri {| ?q <<:s1 :p1 ?z>> |}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-05-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-05-quads.sparql
deleted file mode 100644
index 8ae34730..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-05-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX :        <http://example.com/ns#>
-PREFIX xsd:     <http://www.w3.org/2001/XMLSchema#>
-
-SELECT * {
-   <<?s :p1 :o1>> ?p ?o ~ :iri {| :r ?Z |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-06-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-06-quads.sparql
deleted file mode 100644
index 9f682e64..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-06-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o ~ :iri {| :r/:q 'ABC' |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-07-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-07-quads.sparql
deleted file mode 100644
index 659d668a..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-07-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o ~ :iri {| :r [ :p1|:p2 'ABC'] |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-08-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-08-quads.sparql
deleted file mode 100644
index 68c27967..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-08-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT {
-      ?s ?p ?o ~ :iri {| :source ?g |}
-}
-WHERE { GRAPH ?g { ?s ?p ?o } }
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-09-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-09-quads.sparql
deleted file mode 100644
index 3e46b0d3..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-09-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s :p ?o ~ _:bnode {| :q1 ?z |}
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-01-quads.sparql
deleted file mode 100644
index 2c17910b..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o ~ :iri .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-02-quads.sparql
deleted file mode 100644
index 40039351..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s :p ?o ~ :iri1 {| :r1 ?Z1 |} ~:iri2 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-03-quads.sparql
deleted file mode 100644
index 087f3308..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-03-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s :p ?o ~ :iri1 {| :r1 ?Z1 |} ~:iri2 {| :r2 ?Z2 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-04-quads.sparql
deleted file mode 100644
index ecbac66f..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-04-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o ~ :iri1 {| :r1 ?Z1 |} ~ :iri2 {| :r2 ?Z2 |} ~ :iri3 {| :r3 ?Z3 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-05-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-05-quads.sparql
deleted file mode 100644
index 93401c99..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-05-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o ~ :iri1 ~ :iri2 {| :r1 ?Z1 |} {| :r2 ?Z2 |} ~ :iri3 {| :r3 ?Z3 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-06-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-06-quads.sparql
deleted file mode 100644
index fd3f1607..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-06-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s ?p ?o ~ :iri .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-07-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-07-quads.sparql
deleted file mode 100644
index ebac267c..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-07-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s :p ?o ~ :iri1 {| :r1 ?Z1 |} ~:iri2 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-08-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-08-quads.sparql
deleted file mode 100644
index 7679344f..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-08-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s :p ?o ~ :iri1 {| :r1 ?Z1 |} ~:iri2 {| :r2 ?Z2 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-09-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-09-quads.sparql
deleted file mode 100644
index 45ca4614..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-09-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s ?p ?o ~ :iri1 {| :r1 ?Z1 |} ~ :iri2 {| :r2 ?Z2 |} ~ :iri3 {| :r3 ?Z3 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-10-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-10-quads.sparql
deleted file mode 100644
index b19bb157..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-annotation-reifier-multiple-10-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-  ?s ?p ?o ~ :iri1 ~ :iri2 {| :r1 ?Z1 |} {| :r2 ?Z2 |} ~ :iri3 {| :r3 ?Z3 |} .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-01-quads.sparql
deleted file mode 100644
index d48d407b..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    << :a :b :c >> :p1 :o1.
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-02-quads.sparql
deleted file mode 100644
index 9660efec..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    :s :p << :a :b "c" >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-03-quads.sparql
deleted file mode 100644
index e4cbd4c7..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-03-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    << ?s ?p ?o >> ?Y ?Z .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-04-quads.sparql
deleted file mode 100644
index a036a8e9..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-04-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    ?S ?P << ?a ?b ?c >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-06-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-06-quads.sparql
deleted file mode 100644
index 88fe48d1..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-06-quads.sparql
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT { <<:s :p :o >> :q :z }
-WHERE {}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-07-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-07-quads.sparql
deleted file mode 100644
index d0af4d4d..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-07-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   <<?s ?p ?o >> ?q ?z .
-   ?a ?b <<?s ?p ?o >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-08-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-08-quads.sparql
deleted file mode 100644
index b4efdfd2..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-08-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * WHERE {
-   << ?s ?p ?o >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-09-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-09-quads.sparql
deleted file mode 100644
index 30d0c846..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-09-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * WHERE {
-   << :s :p :o >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-10-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-10-quads.sparql
deleted file mode 100644
index 148ed1e2..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-10-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * WHERE {
-   << :s :p << ?s :p2 :o2 >> >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-11-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-11-quads.sparql
deleted file mode 100644
index 3444956c..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-11-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   << ?s ?p ?o >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-12-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-12-quads.sparql
deleted file mode 100644
index c8e813a0..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-12-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   << :s :p :o >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-13-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-13-quads.sparql
deleted file mode 100644
index 1219f480..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-anonreifier-13-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   << :s :p << ?s :p2 :o2 >> >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-01-quads.sparql
deleted file mode 100644
index 115d6a31..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    << :a :b :c ~ :iri >> :p1 :o1.
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-02-quads.sparql
deleted file mode 100644
index 20e1db93..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    :s :p << :a :b "c" ~ :iri >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-03-quads.sparql
deleted file mode 100644
index b93c63fe..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-03-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    << ?s ?p ?o ~ _:bnode >> ?Y ?Z .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-04-quads.sparql
deleted file mode 100644
index c30f2b6a..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-04-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    ?S ?P << ?a ?b ?c ~ :iri >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-06-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-06-quads.sparql
deleted file mode 100644
index 09b392fe..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-06-quads.sparql
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT { <<:s :p :o ~ :iri >> :q :z }
-WHERE {}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-07-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-07-quads.sparql
deleted file mode 100644
index 9257c6c5..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-07-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   <<?s ?p ?o ~ :iri >> ?q ?z .
-   ?a ?b <<?s ?p ?o ~ _:bnode >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-08-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-08-quads.sparql
deleted file mode 100644
index a5485c4c..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-08-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * WHERE {
-   << ?s ?p ?o ~ :iri >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-09-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-09-quads.sparql
deleted file mode 100644
index ebcd537c..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-09-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * WHERE {
-   << :s :p :o ~ :iri >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-10-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-10-quads.sparql
deleted file mode 100644
index bf6a5a20..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-10-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * WHERE {
-   << :s :p << ?s :p2 :o2 ~ :iri2 >> ~ :iri1 >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-11-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-11-quads.sparql
deleted file mode 100644
index 0ee2b9f3..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-11-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   << ?s ?p ?o ~ :iri >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-12-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-12-quads.sparql
deleted file mode 100644
index da5bc7ee..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-12-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   << :s :p :o ~ :iri >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-13-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-13-quads.sparql
deleted file mode 100644
index 8aecb8f0..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-reifier-13-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   << :s :p << ?s :p2 :o2 ~ :iri2 >> ~ :iri1 >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-01-quads.sparql
deleted file mode 100644
index b2e6757d..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    <<( :a :b :c )>> :p1 :o1.
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-02-quads.sparql
deleted file mode 100644
index d2754ae1..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    :s :p <<( :a :b "c" )>> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-03-quads.sparql
deleted file mode 100644
index 5fdcad65..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-03-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    <<( ?s ?p ?o )>> ?Y ?Z .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-04-quads.sparql
deleted file mode 100644
index d8441ab9..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-04-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    ?S ?P <<( ?a ?b ?c )>> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-05-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-05-quads.sparql
deleted file mode 100644
index c3388891..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-05-quads.sparql
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    VALUES ?x {
-        <<(:s :p :o )>>
-        <<( :x :q <<(:s :p :o )>> )>>
-    }
-    VALUES (?y ?z) { (<<(:s :p :o )>> 123 )
-                      (123 <<(:s :p :o )>> ) }
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-06-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-06-quads.sparql
deleted file mode 100644
index 81488a26..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-06-quads.sparql
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT { :s :q <<(:s :p :o )>> }
-WHERE {}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-07-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-07-quads.sparql
deleted file mode 100644
index a6b45b4f..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-basic-tripleterm-07-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT WHERE {
-   :s ?q <<(?s ?p :o )>> .
-   ?a ?b <<(?s ?p ?o )>> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-01-quads.sparql
deleted file mode 100644
index 01e549be..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   <<_:a :p :o >> :q 456 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-02-quads.sparql
deleted file mode 100644
index 8bebeb24..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   <<:s :p _:a >> :q 456 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-03-quads.sparql
deleted file mode 100644
index 8af6ea71..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-anonreifier-03-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    <<[] :p [] >> :q :z .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-01-quads.sparql
deleted file mode 100644
index 86e96d99..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   <<_:a :p :o ~ :iri >> :q 456 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-02-quads.sparql
deleted file mode 100644
index 1aca35d6..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   <<:s :p _:a ~ _:bnode >> :q 456 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-03-quads.sparql
deleted file mode 100644
index 8a68c066..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-reifier-03-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    <<[] :p [] ~ :iri >> :q :z .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-01-quads.sparql
deleted file mode 100644
index 6709094d..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   <<(_:a :p :o )>> :q 456 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-02-quads.sparql
deleted file mode 100644
index f30a4a8c..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-   <<(:s :p _:a )>> :q 456 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-03-quads.sparql
deleted file mode 100644
index 573301ea..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-bnode-tripleterm-03-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    <<([] :p [] )>> :q :z .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-all-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-all-quads.sparql
deleted file mode 100644
index 79f30c34..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-all-quads.sparql
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-
-  <<:x ?R :z >> :p <<:a :b ?C ~ _:bnode >> .
-
-  << <<:x ?R :z >> :p <<(:a :b [] )>> ~ _:bnode >>
-     :q
-  << <<[] ?R :z ~ :iri >> :p <<:a :b [] >> >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-anonreifier-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-anonreifier-quads.sparql
deleted file mode 100644
index ee448d4e..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-anonreifier-quads.sparql
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-
-  <<:x ?R :z >> :p <<:a :b ?C >> .
-
-  << <<:x ?R :z >> :p <<:a :b [] >> >>
-     :q
-  << <<[] ?R :z >> :p <<:a :b [] >> >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-reifier-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-reifier-quads.sparql
deleted file mode 100644
index f2f56ef0..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-reifier-quads.sparql
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-
-  <<:x ?R :z ~ :iri1 >> :p <<:a :b ?C ~ :iri2 >> .
-
-  << <<:x ?R :z ~ _:bnode1 >> :p <<:a :b [] ~ _:bnode1 >> ~ :iri3 >>
-     :q
-  << <<[] ?R :z ~ _:bnode2 >> :p <<:a :b [] ~_:bnode2 >> ~:iri3 >> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-tripleterm-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-tripleterm-quads.sparql
deleted file mode 100644
index 872fbfad..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-compound-tripleterm-quads.sparql
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-
-  ?s :p <<(:a :b ?C )>> .
-  ?s
-     :q
-  <<( ?s1 :p <<(:a :b [] )>> )>> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-01-quads.sparql
deleted file mode 100644
index d7133da1..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-01-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o .
-  BIND(<<(?s ?p ?o)>> AS ?t)
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-03-quads.sparql
deleted file mode 100644
index 83526adb..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-03-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o .
-  BIND(TRIPLE(?s, ?p, ?o) AS ?t1)
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-04-quads.sparql
deleted file mode 100644
index 1d7e04ce..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-04-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?s ?p ?o .
-  BIND(TRIPLE(?s, ?p, str(?o)) AS ?t2)
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-05-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-05-quads.sparql
deleted file mode 100644
index 5b3d6020..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-05-quads.sparql
+++ /dev/null
@@ -1,9 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ?t :source :g
-  FILTER(isTriple(?t))
-  FILTER(SUBJECT(?t) = :s)
-  FILTER(PREDICATE(?t) = :p)
-  FILTER(OBJECT(?t) = :o)
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-06-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-06-quads.sparql
deleted file mode 100644
index f7450d3f..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-expr-tripleterm-06-quads.sparql
+++ /dev/null
@@ -1,10 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-CONSTRUCT {
-  ?t :graph ?g .
-} WHERE {
-  GRAPH ?g {
-    ?s ?p ?o .
-    BIND(<<(?s ?p  ?o)>> AS ?t)
-  }
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-anonreifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-anonreifier-01-quads.sparql
deleted file mode 100644
index 7f2cc1eb..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-anonreifier-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    [ ?Q <<:s ?P :o>> ] :b :c .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-anonreifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-anonreifier-02-quads.sparql
deleted file mode 100644
index f94cbdc2..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-anonreifier-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ( <<?S1 :p :o1>> <<?S2 :p :o2>> )  :q 123 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-reifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-reifier-01-quads.sparql
deleted file mode 100644
index 4c3f39cd..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-reifier-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    [ ?Q <<:s ?P :o ~ :iri>> ] :b :c .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-reifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-reifier-02-quads.sparql
deleted file mode 100644
index aa8d396d..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-reifier-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ( <<?S1 :p :o1 ~ :iri >> <<?S2 :p :o2 ~ _:bnode>> )  :q 123 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-tripleterm-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-tripleterm-01-quads.sparql
deleted file mode 100644
index 11d5ec3b..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-tripleterm-01-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-    [ ?Q <<(:s ?P :o)>> ] :b :c .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-tripleterm-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-tripleterm-02-quads.sparql
deleted file mode 100644
index 8d497177..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-inside-tripleterm-02-quads.sparql
+++ /dev/null
@@ -1,5 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  ( <<(?S1 :p :o1)>> <<(?S2 :p :o2)>> )  :q 123 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-anonreifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-anonreifier-01-quads.sparql
deleted file mode 100644
index 7905cffa..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-anonreifier-01-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  <<?S :p :o >> :r :z .
-  << <<?S :p :o >> :r :z >> :q 1 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-anonreifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-anonreifier-02-quads.sparql
deleted file mode 100644
index df1e2891..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-anonreifier-02-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :a :q <<:s :p ?O >> .
-  << :a :q <<:s :p ?O >>>> :r :z .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-reifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-reifier-01-quads.sparql
deleted file mode 100644
index ed0fb15d..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-reifier-01-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  <<?S :p :o ~ :iri >> :r :z .
-  << <<?S :p :o ~ :iri >> :r :z ~ _:bnode >> :q 1 .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-reifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-reifier-02-quads.sparql
deleted file mode 100644
index a51f5401..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-reifier-02-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :a :q <<:s :p ?O ~ :iri >> .
-  << :a :q <<:s :p ?O ~ :iri >> ~ _:bnode>> :r :z .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-tripleterm-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-tripleterm-01-quads.sparql
deleted file mode 100644
index e8abaaf1..00000000
--- a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-nested-tripleterm-01-quads.sparql
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example.com/ns#>
-
-SELECT * {
-  :s :r <<(?S :p :o )>> .
-  :s :q <<( :s1 :r <<(?S :p :o )>> )>> .
-}
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-01-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-01.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-02-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-02.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-03-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-03.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-04-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-04.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-05-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-05-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-05.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-06-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-06-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-anonreifier-06.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-01.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-01-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-01.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-02-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-02.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-02-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-02.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-03.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-03-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-03.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-04.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-04-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-04.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-05-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-05.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-05-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-05.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-06-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-06.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-06-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-06.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-07-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-07.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-07-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-07.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-08-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-08.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-08-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-reifier-08.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-01-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-01-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-01.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-03-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-03-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-03.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-04-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-04-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-04.sparql
diff --git a/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-05-quads.sparql b/packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql
similarity index 100%
rename from packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-05-quads.sparql
rename to packages/test-utils/statics/algebra/sparql/sparql12/sparql-1-2-syntax-update-tripleterm-05.sparql

From 7df591dc0f2adfcbc19adbab87b00329ddd43f13 Mon Sep 17 00:00:00 2001
From: Jitse De Smet <jitse@reedonk8.be>
Date: Thu, 7 May 2026 14:20:59 +0000
Subject: [PATCH 2/4] update test utils

---
 .../test/extraCoverage.test.ts                |  18 +-
 .../test/generateJson.test.ts                 |   2 +-
 .../lib/toAlgebra/updates.ts                  |   2 +
 .../lib/generators/algebraGenerators.ts       |  68 ++-
 .../dawg-syntax/basic/01-quads.json           |   8 +
 .../dawg-syntax/basic/02-quads.json           |   8 +
 .../dawg-syntax/basic/03-quads.json           |  42 ++
 .../dawg-syntax/basic/04-quads.json           |  42 ++
 .../dawg-syntax/basic/05-quads.json           |  74 +++
 .../dawg-syntax/basic/06-quads.json           |  74 +++
 .../dawg-syntax/bnodes/01-quads.json          |  29 ++
 .../dawg-syntax/bnodes/02-quads.json          |  29 ++
 .../dawg-syntax/bnodes/03-quads.json          |  86 ++++
 .../dawg-syntax/bnodes/04-quads.json          |  29 ++
 .../dawg-syntax/bnodes/05-quads.json          |  49 ++
 .../dawg-syntax/bnodes/06-clash-quads.json    |  82 ++++
 .../dawg-syntax/expr/01-quads.json            |  53 ++
 .../dawg-syntax/expr/02-quads.json            |  72 +++
 .../dawg-syntax/expr/03-quads.json            |  85 ++++
 .../dawg-syntax/expr/04-quads.json            |  63 +++
 .../dawg-syntax/expr/05-quads.json            |  71 +++
 .../dawg-syntax/forms/01-quads.json           | 210 ++++++++
 .../dawg-syntax/forms/02-quads.json           |  89 ++++
 .../dawg-syntax/limit-offset/01-quads.json    |  60 +++
 .../dawg-syntax/limit-offset/02-quads.json    |  60 +++
 .../dawg-syntax/limit-offset/03-quads.json    |  60 +++
 .../dawg-syntax/limit-offset/04-quads.json    |  59 +++
 .../dawg-syntax/lists/01-quads.json           |  78 +++
 .../dawg-syntax/lists/02-quads.json           |  78 +++
 .../dawg-syntax/lists/03-quads.json           |  54 +++
 .../dawg-syntax/lists/04-quads.json           |  94 ++++
 .../dawg-syntax/lists/05-quads.json           |  49 ++
 .../dawg-syntax/lit/01-quads.json             |  33 ++
 .../dawg-syntax/lit/02-quads.json             |  33 ++
 .../dawg-syntax/lit/03-quads.json             |  33 ++
 .../dawg-syntax/lit/04-quads.json             |  33 ++
 .../dawg-syntax/lit/05-quads.json             |  33 ++
 .../dawg-syntax/lit/06-quads.json             |  33 ++
 .../dawg-syntax/lit/07-quads.json             |  33 ++
 .../dawg-syntax/lit/08-quads.json             |  33 ++
 .../dawg-syntax/lit/09-quads.json             |  33 ++
 .../dawg-syntax/lit/10-quads.json             |  33 ++
 .../dawg-syntax/lit/11-quads.json             |  33 ++
 .../dawg-syntax/lit/12-quads.json             |  33 ++
 .../dawg-syntax/lit/13-quads.json             |  33 ++
 .../dawg-syntax/lit/14-quads.json             |  33 ++
 .../dawg-syntax/lit/15-quads.json             |  33 ++
 .../dawg-syntax/lit/16-quads.json             |  33 ++
 .../dawg-syntax/lit/17-quads.json             |  33 ++
 .../dawg-syntax/lit/18-quads.json             |  33 ++
 .../dawg-syntax/lit/19-quads.json             |  33 ++
 .../dawg-syntax/lit/20-quads.json             |  33 ++
 .../dawg-syntax/opt-filter/01-quads.json      | 103 ++++
 .../dawg-syntax/opt-filter/02-quads.json      | 137 ++++++
 .../dawg-syntax/order/01-quads.json           |  55 +++
 .../dawg-syntax/order/02-quads.json           |  74 +++
 .../dawg-syntax/order/03-quads.json           |  55 +++
 .../dawg-syntax/order/04-quads.json           |  62 +++
 .../dawg-syntax/order/05-quads.json           |  80 +++
 .../dawg-syntax/order/06-quads.json           | 107 ++++
 .../dawg-syntax/order/07-quads.json           |  62 +++
 .../dawg-syntax/pat/01-quads.json             |   8 +
 .../dawg-syntax/pat/02-quads.json             | 102 ++++
 .../dawg-syntax/pat/03-quads.json             | 128 +++++
 .../dawg-syntax/reduced/01-quads.json         |  45 ++
 .../dawg-syntax/struct/01-quads.json          |  17 +
 .../dawg-syntax/struct/02-quads.json          |  38 ++
 .../dawg-syntax/struct/13-quads.json          | 119 +++++
 .../aggregates/agg-empty-group-quads.json     |  82 ++++
 .../sparql-1.1/aggregates/avg-quads.json      |  73 +++
 .../aggregates/avg-with-group-by-quads.json   | 112 +++++
 .../sparql-1.1/aggregates/count-3-quads.json  | 112 +++++
 .../sparql-1.1/aggregates/count-8b-quads.json | 145 ++++++
 .../aggregates/error-in-avg-quads.json        | 171 +++++++
 .../aggregates/group-concat-1-quads.json      | 141 ++++++
 .../aggregates/group-concat-2-quads.json      | 458 ++++++++++++++++++
 .../group-concat-with-separator-quads.json    | 141 ++++++
 .../protect-from-error-in-avg-quads.json      | 141 ++++++
 .../sparql-1.1/aggregates/sample-quads.json   | 174 +++++++
 .../sparql-1.1/ask/group-concat-1-quads.json  | 141 ++++++
 .../sparql-1.1/ask/in-1-quads.json            |  65 +++
 .../sparql-1.1/ask/not-in-1-quads.json        |  29 ++
 ...e-undistinguished-variable-test-quads.json |  28 ++
 ...le-of-undistinguished-variables-quads.json |  88 ++++
 .../sparql-1.1/ask/syn-pname-01-quads.json    |   7 +
 .../sparql-1.1/bind/01-quads.json             |  68 +++
 .../sparql-1.1/bind/02-quads.json             | 110 +++++
 .../sparql-1.1/bind/03-quads.json             | 102 ++++
 .../sparql-1.1/bind/04-quads.json             |  61 +++
 .../sparql-1.1/bind/05-quads.json             | 110 +++++
 .../sparql-1.1/bind/07-quads.json             | 132 +++++
 .../sparql-1.1/bind/08-quads.json             | 110 +++++
 .../sparql-1.1/bind/10-quads.json             |  96 ++++
 .../sparql-1.1/bind/11-quads.json             |  96 ++++
 .../construct/construct-from-quads.json       |  65 +++
 .../construct/construct-slice-quads.json      |  55 +++
 .../construct/constructwhere01-quads.json     |  50 ++
 .../construct/constructwhere02-quads.json     |  90 ++++
 .../construct/constructwhere03-quads.json     |  90 ++++
 .../constructwhere05-modified-quads.json      |  76 +++
 .../construct/constructwhere06-quads.json     |  50 ++
 ...ative-exists-in-positive-exists-quads.json | 104 ++++
 .../exists/nested-positive-exists-quads.json  | 104 ++++
 .../sparql-1.1/functions/bnode-str-quads.json | 226 +++++++++
 .../sparql-1.1/functions/now-quads.json       |  53 ++
 .../functions/strlang-str-quads.json          | 116 +++++
 .../sparql-1.1/group/01-quads.json            |  44 ++
 .../sparql-1.1/group/03-quads.json            | 112 +++++
 .../sparql-1.1/group/04-quads.json            | 146 ++++++
 ...ich-sets-have-the-same-elements-quads.json | 307 ++++++++++++
 ...oximity-by-exclusion-not-exists-quads.json | 191 ++++++++
 .../negation/simple-minus-quads.json          |  68 +++
 ...inus-from-a-fully-bound-minuend-quads.json | 165 +++++++
 ...-from-a-partially-bound-minuend-quads.json | 205 ++++++++
 .../paths/01-simple-path-quads.json           |  74 +++
 .../sparql-1.1/paths/02-star-path-quads.json  |  53 ++
 .../paths/08-reverse-path-quads.json          |  28 ++
 .../paths/09-reverse-sequence-path-quads.json |  54 +++
 .../paths/10-path-with-negation-quads.json    |  37 ++
 ...d-two-paths-to-same-target-node-quads.json |  46 ++
 .../paths/14-star-path-over-foaf-quads.json   |  59 +++
 .../14-star-path-over-foafknows-quads.json    |  59 +++
 .../paths/28a-diamond-with-loop-quads.json    |  46 ++
 .../paths/30-operator-precedence-1-quads.json |  62 +++
 .../paths/31-operator-precedence-2-quads.json |  82 ++++
 .../paths/32-operator-precedence-3-quads.json |  65 +++
 .../paths/33-operator-precedence-4-quads.json |  70 +++
 .../sparql-1.1/paths/37-nested-quads.json     |  50 ++
 .../sparql-1.1/paths/path-union-quads.json    |  98 ++++
 .../sparql-1.1/service/service01-quads.json   |  80 +++
 .../sparql-1.1/service/service02-quads.json   |  88 ++++
 .../sparql-1.1/service/service03-quads.json   |  88 ++++
 .../sparql-1.1/service/service04-quads.json   | 102 ++++
 .../sparql-1.1/service/service05-quads.json   | 126 +++++
 .../sparql-1.1/service/service06-quads.json   |  88 ++++
 .../sparql-1.1/service/service07-quads.json   |  80 +++
 .../subqueries/06-subquery-quads.json         |  51 ++
 .../08-subquery-with-aggregate-quads.json     | 116 +++++
 .../09-nested-subqueries-quads.json           |  86 ++++
 .../11-subquery-limit-per-resource-quads.json | 127 +++++
 .../sparql-1.1/syntax/aggregate-15-quads.json |  53 ++
 .../sparql-1.1/syntax/bindscope1-quads.json   | 102 ++++
 .../syntax/syntax-oneof-01-quads.json         | 111 +++++
 .../syntax/syntax-oneof-03-quads.json         |  80 +++
 .../syntax/syntax-subquery-02-quads.json      |  59 +++
 .../sparql-1.1/values/01-bind-quads.json      |  84 ++++
 ...ith-2-obj-vars-1-row-with-undef-quads.json |  92 ++++
 ...th-2-obj-vars-2-rows-with-undef-quads.json |  98 ++++
 ...ues-with-optional-obj-var-1-row-quads.json |  94 ++++
 ...uery-values-with-subj-var-1-row-quads.json |  84 ++++
 .../values/post-subquery-values-quads.json    |  77 +++
 .../values/values-many-once-quads.json        |  38 ++
 .../sparql11-query/describe/16.4.1-quads.json |  13 +
 .../describe/16.4.2a-quads.json               |  34 ++
 .../describe/16.4.2c-quads.json               |  42 ++
 .../describe/star-empty-quads.json            |   8 +
 .../sparql11-query/describe/star-quads.json   |  38 ++
 .../sparql11-query/empty-quads.json           |   3 +
 .../existence-subquery-quads.json             | 148 ++++++
 .../sparql11-query/filter-union-quads.json    |  63 +++
 .../sparql11-query/from/13.2.1-quads.json     |  44 ++
 .../sparql11-query/from/13.2.2-quads.json     |  48 ++
 .../sparql11-query/from/13.2.3-quads.json     |  81 ++++
 .../sparql11-query/from/13.3.1-quads.json     |  72 +++
 .../sparql11-query/from/13.3.2-quads.json     |  68 +++
 .../sparql11-query/from/13.3.3-quads.json     | 176 +++++++
 .../sparql11-query/from/13.3.4-quads.json     | 102 ++++
 .../sparql11-query/group-by-no-var-quads.json | 100 ++++
 .../sparql11-query/negate-and-quads.json      | 117 +++++
 .../sparql11-query/negated-path-quads.json    |  38 ++
 .../sparql11-query/nested-union-quads.json    | 196 ++++++++
 .../path-inverse-negation-quads.json          |  50 ++
 .../sparql11-query/project-filter-quads.json  |  97 ++++
 .../sparql11-query/unused-extend-quads.json   |  99 ++++
 .../update/clear-drop-quads.json              |  74 +++
 .../update/load-into-quads.json               |  11 +
 .../sparql11-query/update/load-quads.json     |   7 +
 .../update/sparql-update-3-2-3-quads.json     |   8 +
 .../update/sparql-update-3-2-4-quads.json     |   8 +
 .../update/sparql-update-3-2-5-quads.json     |   8 +
 .../sparql12/sparql-1-2-ar-langdir-quads.json |  44 ++
 .../sparql12/sparql-1-2-ar-langdir.json       |   2 +-
 .../sparql12/sparql-1-2-en-langdir-quads.json |  44 ++
 .../sparql12/sparql-1-2-en-langdir.json       |   2 +-
 .../algebra/dawg-syntax/basic/01-quads.json   |   8 +
 .../algebra/dawg-syntax/basic/02-quads.json   |   8 +
 .../algebra/dawg-syntax/basic/03-quads.json   |  42 ++
 .../algebra/dawg-syntax/basic/04-quads.json   |  42 ++
 .../algebra/dawg-syntax/basic/05-quads.json   |  74 +++
 .../algebra/dawg-syntax/basic/06-quads.json   |  74 +++
 .../algebra/dawg-syntax/bnodes/01-quads.json  |  29 ++
 .../algebra/dawg-syntax/bnodes/02-quads.json  |  29 ++
 .../algebra/dawg-syntax/bnodes/03-quads.json  |  86 ++++
 .../algebra/dawg-syntax/bnodes/04-quads.json  |  29 ++
 .../algebra/dawg-syntax/bnodes/05-quads.json  |  49 ++
 .../dawg-syntax/bnodes/06-clash-quads.json    |  82 ++++
 .../algebra/dawg-syntax/expr/01-quads.json    |  53 ++
 .../algebra/dawg-syntax/expr/02-quads.json    |  72 +++
 .../algebra/dawg-syntax/expr/03-quads.json    |  85 ++++
 .../algebra/dawg-syntax/expr/04-quads.json    |  63 +++
 .../algebra/dawg-syntax/expr/05-quads.json    |  71 +++
 .../algebra/dawg-syntax/forms/01-quads.json   | 210 ++++++++
 .../algebra/dawg-syntax/forms/02-quads.json   |  89 ++++
 .../dawg-syntax/limit-offset/01-quads.json    |  60 +++
 .../dawg-syntax/limit-offset/02-quads.json    |  60 +++
 .../dawg-syntax/limit-offset/03-quads.json    |  60 +++
 .../dawg-syntax/limit-offset/04-quads.json    |  59 +++
 .../algebra/dawg-syntax/lists/01-quads.json   |  78 +++
 .../algebra/dawg-syntax/lists/02-quads.json   |  78 +++
 .../algebra/dawg-syntax/lists/03-quads.json   |  54 +++
 .../algebra/dawg-syntax/lists/04-quads.json   |  94 ++++
 .../algebra/dawg-syntax/lists/05-quads.json   |  49 ++
 .../algebra/dawg-syntax/lit/01-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/02-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/03-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/04-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/05-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/06-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/07-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/08-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/09-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/10-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/11-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/12-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/13-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/14-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/15-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/16-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/17-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/18-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/19-quads.json     |  33 ++
 .../algebra/dawg-syntax/lit/20-quads.json     |  33 ++
 .../dawg-syntax/opt-filter/01-quads.json      | 103 ++++
 .../dawg-syntax/opt-filter/02-quads.json      | 137 ++++++
 .../algebra/dawg-syntax/order/01-quads.json   |  55 +++
 .../algebra/dawg-syntax/order/02-quads.json   |  74 +++
 .../algebra/dawg-syntax/order/03-quads.json   |  55 +++
 .../algebra/dawg-syntax/order/04-quads.json   |  62 +++
 .../algebra/dawg-syntax/order/05-quads.json   |  80 +++
 .../algebra/dawg-syntax/order/06-quads.json   | 107 ++++
 .../algebra/dawg-syntax/order/07-quads.json   |  62 +++
 .../algebra/dawg-syntax/pat/01-quads.json     |   8 +
 .../algebra/dawg-syntax/pat/02-quads.json     | 102 ++++
 .../algebra/dawg-syntax/pat/03-quads.json     | 128 +++++
 .../algebra/dawg-syntax/reduced/01-quads.json |  45 ++
 .../algebra/dawg-syntax/struct/01-quads.json  |  17 +
 .../algebra/dawg-syntax/struct/02-quads.json  |  38 ++
 .../algebra/dawg-syntax/struct/13-quads.json  | 119 +++++
 .../aggregates/agg-empty-group-quads.json     |  82 ++++
 .../sparql-1.1/aggregates/avg-quads.json      |  73 +++
 .../aggregates/avg-with-group-by-quads.json   | 112 +++++
 .../sparql-1.1/aggregates/count-3-quads.json  | 112 +++++
 .../sparql-1.1/aggregates/count-8b-quads.json | 145 ++++++
 .../aggregates/error-in-avg-quads.json        | 171 +++++++
 .../aggregates/group-concat-1-quads.json      | 141 ++++++
 .../aggregates/group-concat-2-quads.json      | 458 ++++++++++++++++++
 .../group-concat-with-separator-quads.json    | 141 ++++++
 .../protect-from-error-in-avg-quads.json      | 141 ++++++
 .../sparql-1.1/aggregates/sample-quads.json   | 174 +++++++
 .../sparql-1.1/ask/group-concat-1-quads.json  | 141 ++++++
 .../algebra/sparql-1.1/ask/in-1-quads.json    |  65 +++
 .../sparql-1.1/ask/not-in-1-quads.json        |  29 ++
 ...e-undistinguished-variable-test-quads.json |  28 ++
 ...le-of-undistinguished-variables-quads.json |  88 ++++
 .../sparql-1.1/ask/syn-pname-01-quads.json    |   7 +
 .../algebra/sparql-1.1/bind/01-quads.json     |  68 +++
 .../algebra/sparql-1.1/bind/02-quads.json     | 110 +++++
 .../algebra/sparql-1.1/bind/03-quads.json     | 102 ++++
 .../algebra/sparql-1.1/bind/04-quads.json     |  61 +++
 .../algebra/sparql-1.1/bind/05-quads.json     | 110 +++++
 .../algebra/sparql-1.1/bind/07-quads.json     | 132 +++++
 .../algebra/sparql-1.1/bind/08-quads.json     | 110 +++++
 .../algebra/sparql-1.1/bind/10-quads.json     |  96 ++++
 .../algebra/sparql-1.1/bind/11-quads.json     |  96 ++++
 .../construct/construct-from-quads.json       |  65 +++
 .../construct/construct-slice-quads.json      |  55 +++
 .../construct/constructwhere01-quads.json     |  50 ++
 .../construct/constructwhere02-quads.json     |  90 ++++
 .../construct/constructwhere03-quads.json     |  90 ++++
 .../constructwhere05-modified-quads.json      |  76 +++
 .../construct/constructwhere06-quads.json     |  50 ++
 ...ative-exists-in-positive-exists-quads.json | 104 ++++
 .../exists/nested-positive-exists-quads.json  | 104 ++++
 .../sparql-1.1/functions/bnode-str-quads.json | 226 +++++++++
 .../sparql-1.1/functions/now-quads.json       |  53 ++
 .../functions/strlang-str-quads.json          | 116 +++++
 .../algebra/sparql-1.1/group/01-quads.json    |  44 ++
 .../algebra/sparql-1.1/group/03-quads.json    | 112 +++++
 .../algebra/sparql-1.1/group/04-quads.json    | 146 ++++++
 ...ich-sets-have-the-same-elements-quads.json | 307 ++++++++++++
 ...oximity-by-exclusion-not-exists-quads.json | 191 ++++++++
 .../negation/simple-minus-quads.json          |  68 +++
 ...inus-from-a-fully-bound-minuend-quads.json | 165 +++++++
 ...-from-a-partially-bound-minuend-quads.json | 205 ++++++++
 .../paths/01-simple-path-quads.json           |  74 +++
 .../sparql-1.1/paths/02-star-path-quads.json  |  53 ++
 .../paths/08-reverse-path-quads.json          |  28 ++
 .../paths/09-reverse-sequence-path-quads.json |  54 +++
 .../paths/10-path-with-negation-quads.json    |  37 ++
 ...d-two-paths-to-same-target-node-quads.json |  46 ++
 .../paths/14-star-path-over-foaf-quads.json   |  59 +++
 .../14-star-path-over-foafknows-quads.json    |  59 +++
 .../paths/28a-diamond-with-loop-quads.json    |  46 ++
 .../paths/30-operator-precedence-1-quads.json |  62 +++
 .../paths/31-operator-precedence-2-quads.json |  82 ++++
 .../paths/32-operator-precedence-3-quads.json |  65 +++
 .../paths/33-operator-precedence-4-quads.json |  70 +++
 .../sparql-1.1/paths/37-nested-quads.json     |  50 ++
 .../sparql-1.1/paths/path-union-quads.json    |  98 ++++
 .../sparql-1.1/service/service01-quads.json   |  80 +++
 .../sparql-1.1/service/service02-quads.json   |  88 ++++
 .../sparql-1.1/service/service03-quads.json   |  88 ++++
 .../sparql-1.1/service/service04-quads.json   | 102 ++++
 .../sparql-1.1/service/service05-quads.json   | 126 +++++
 .../sparql-1.1/service/service06-quads.json   |  88 ++++
 .../sparql-1.1/service/service07-quads.json   |  80 +++
 .../subqueries/06-subquery-quads.json         |  51 ++
 .../08-subquery-with-aggregate-quads.json     | 116 +++++
 .../09-nested-subqueries-quads.json           |  86 ++++
 .../11-subquery-limit-per-resource-quads.json | 127 +++++
 .../sparql-1.1/syntax/aggregate-15-quads.json |  53 ++
 .../sparql-1.1/syntax/bindscope1-quads.json   | 102 ++++
 .../syntax/syntax-oneof-01-quads.json         | 111 +++++
 .../syntax/syntax-oneof-03-quads.json         |  80 +++
 .../syntax/syntax-subquery-02-quads.json      |  59 +++
 .../sparql-1.1/values/01-bind-quads.json      |  84 ++++
 ...ith-2-obj-vars-1-row-with-undef-quads.json |  92 ++++
 ...th-2-obj-vars-2-rows-with-undef-quads.json |  98 ++++
 ...ues-with-optional-obj-var-1-row-quads.json |  94 ++++
 ...uery-values-with-subj-var-1-row-quads.json |  84 ++++
 .../values/post-subquery-values-quads.json    |  77 +++
 .../values/values-many-once-quads.json        |  38 ++
 .../sparql11-query/describe/16.4.1-quads.json |  13 +
 .../describe/16.4.2a-quads.json               |  34 ++
 .../describe/16.4.2c-quads.json               |  42 ++
 .../describe/star-empty-quads.json            |   8 +
 .../sparql11-query/describe/star-quads.json   |  38 ++
 .../algebra/sparql11-query/empty-quads.json   |   3 +
 .../existence-subquery-quads.json             | 148 ++++++
 .../sparql11-query/filter-union-quads.json    |  63 +++
 .../sparql11-query/from/13.2.1-quads.json     |  44 ++
 .../sparql11-query/from/13.2.2-quads.json     |  48 ++
 .../sparql11-query/from/13.2.3-quads.json     |  81 ++++
 .../sparql11-query/from/13.3.1-quads.json     |  72 +++
 .../sparql11-query/from/13.3.2-quads.json     |  68 +++
 .../sparql11-query/from/13.3.3-quads.json     | 176 +++++++
 .../sparql11-query/from/13.3.4-quads.json     | 102 ++++
 .../sparql11-query/group-by-no-var-quads.json | 100 ++++
 .../sparql11-query/negate-and-quads.json      | 117 +++++
 .../sparql11-query/negated-path-quads.json    |  38 ++
 .../sparql11-query/nested-union-quads.json    | 196 ++++++++
 .../path-inverse-negation-quads.json          |  50 ++
 .../sparql11-query/project-filter-quads.json  |  97 ++++
 .../sparql11-query/unused-extend-quads.json   |  99 ++++
 .../update/clear-drop-quads.json              |  74 +++
 .../update/load-into-quads.json               |  11 +
 .../sparql11-query/update/load-quads.json     |   7 +
 .../update/sparql-update-3-2-3-quads.json     |   8 +
 .../update/sparql-update-3-2-4-quads.json     |   8 +
 .../update/sparql-update-3-2-5-quads.json     |   8 +
 .../sparql12/sparql-1-2-ar-langdir-quads.json |  44 ++
 .../sparql12/sparql-1-2-ar-langdir.json       |   2 +-
 .../sparql12/sparql-1-2-en-langdir-quads.json |  44 ++
 .../sparql12/sparql-1-2-en-langdir.json       |   2 +-
 .../base/dawg-syntax/basic/01-quads.sparql    |   2 +
 .../base/dawg-syntax/basic/02-quads.sparql    |   2 +
 .../base/dawg-syntax/basic/03-quads.sparql    |   3 +
 .../base/dawg-syntax/basic/04-quads.sparql    |   3 +
 .../base/dawg-syntax/basic/05-quads.sparql    |   4 +
 .../base/dawg-syntax/basic/06-quads.sparql    |   4 +
 .../base/dawg-syntax/bnodes/01-quads.sparql   |   3 +
 .../base/dawg-syntax/bnodes/02-quads.sparql   |   3 +
 .../base/dawg-syntax/bnodes/03-quads.sparql   |   5 +
 .../base/dawg-syntax/bnodes/04-quads.sparql   |   3 +
 .../base/dawg-syntax/bnodes/05-quads.sparql   |   4 +
 .../dawg-syntax/bnodes/06-clash-quads.sparql  |   5 +
 .../base/dawg-syntax/expr/01-quads.sparql     |   4 +
 .../base/dawg-syntax/expr/02-quads.sparql     |   4 +
 .../base/dawg-syntax/expr/03-quads.sparql     |   4 +
 .../base/dawg-syntax/expr/04-quads.sparql     |   4 +
 .../base/dawg-syntax/expr/05-quads.sparql     |   4 +
 .../base/dawg-syntax/forms/01-quads.sparql    |  11 +
 .../base/dawg-syntax/forms/02-quads.sparql    |   6 +
 .../dawg-syntax/limit-offset/01-quads.sparql  |   5 +
 .../dawg-syntax/limit-offset/02-quads.sparql  |   5 +
 .../dawg-syntax/limit-offset/03-quads.sparql  |   5 +
 .../dawg-syntax/limit-offset/04-quads.sparql  |   5 +
 .../base/dawg-syntax/lists/01-quads.sparql    |   5 +
 .../base/dawg-syntax/lists/02-quads.sparql    |   5 +
 .../base/dawg-syntax/lists/03-quads.sparql    |   4 +
 .../base/dawg-syntax/lists/04-quads.sparql    |   6 +
 .../base/dawg-syntax/lists/05-quads.sparql    |   4 +
 .../base/dawg-syntax/lit/01-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/02-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/03-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/04-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/05-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/06-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/07-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/08-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/09-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/10-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/11-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/12-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/13-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/14-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/15-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/16-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/17-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/18-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/19-quads.sparql      |   3 +
 .../base/dawg-syntax/lit/20-quads.sparql      |   3 +
 .../dawg-syntax/opt-filter/01-quads.sparql    |   7 +
 .../dawg-syntax/opt-filter/02-quads.sparql    |   7 +
 .../base/dawg-syntax/order/01-quads.sparql    |   4 +
 .../base/dawg-syntax/order/02-quads.sparql    |   4 +
 .../base/dawg-syntax/order/03-quads.sparql    |   4 +
 .../base/dawg-syntax/order/04-quads.sparql    |   4 +
 .../base/dawg-syntax/order/05-quads.sparql    |   4 +
 .../base/dawg-syntax/order/06-quads.sparql    |   4 +
 .../base/dawg-syntax/order/07-quads.sparql    |   4 +
 .../base/dawg-syntax/pat/01-quads.sparql      |   2 +
 .../base/dawg-syntax/pat/02-quads.sparql      |   7 +
 .../base/dawg-syntax/pat/03-quads.sparql      |  12 +
 .../base/dawg-syntax/reduced/01-quads.sparql  |   3 +
 .../base/dawg-syntax/struct/01-quads.sparql   |   4 +
 .../base/dawg-syntax/struct/02-quads.sparql   |   5 +
 .../base/dawg-syntax/struct/13-quads.sparql   |  10 +
 .../aggregates/agg-empty-group-quads.sparql   |   4 +
 .../sparql-1.1/aggregates/avg-quads.sparql    |   3 +
 .../aggregates/avg-with-group-by-quads.sparql |   5 +
 .../aggregates/count-3-quads.sparql           |   5 +
 .../aggregates/count-8b-quads.sparql          |   7 +
 .../aggregates/error-in-avg-quads.sparql      |   4 +
 .../aggregates/group-concat-1-quads.sparql    |   8 +
 .../aggregates/group-concat-2-quads.sparql    |   9 +
 .../group-concat-with-separator-quads.sparql  |   8 +
 .../protect-from-error-in-avg-quads.sparql    |   4 +
 .../sparql-1.1/aggregates/sample-quads.sparql |   8 +
 .../ask/group-concat-1-quads.sparql           |   8 +
 .../base/sparql-1.1/ask/in-1-quads.sparql     |   3 +
 .../base/sparql-1.1/ask/not-in-1-quads.sparql |   3 +
 ...undistinguished-variable-test-quads.sparql |   3 +
 ...-of-undistinguished-variables-quads.sparql |   6 +
 .../sparql-1.1/ask/syn-pname-01-quads.sparql  |   2 +
 .../base/sparql-1.1/bind/01-quads.sparql      |   3 +
 .../base/sparql-1.1/bind/02-quads.sparql      |   3 +
 .../base/sparql-1.1/bind/03-quads.sparql      |   7 +
 .../base/sparql-1.1/bind/04-quads.sparql      |   3 +
 .../base/sparql-1.1/bind/05-quads.sparql      |   7 +
 .../base/sparql-1.1/bind/07-quads.sparql      |   9 +
 .../base/sparql-1.1/bind/08-quads.sparql      |   7 +
 .../base/sparql-1.1/bind/10-quads.sparql      |   9 +
 .../base/sparql-1.1/bind/11-quads.sparql      |   7 +
 .../construct/construct-from-quads.sparql     |   7 +
 .../construct/construct-slice-quads.sparql    |   7 +
 .../construct/constructwhere01-quads.sparql   |   6 +
 .../construct/constructwhere02-quads.sparql   |   8 +
 .../construct/constructwhere03-quads.sparql   |   8 +
 .../constructwhere05-modified-quads.sparql    |   9 +
 .../construct/constructwhere06-quads.sparql   |   6 +
 ...ive-exists-in-positive-exists-quads.sparql |  13 +
 .../nested-positive-exists-quads.sparql       |  13 +
 .../functions/bnode-str-quads.sparql          |   5 +
 .../sparql-1.1/functions/now-quads.sparql     |   6 +
 .../functions/strlang-str-quads.sparql        |   4 +
 .../base/sparql-1.1/group/01-quads.sparql     |   4 +
 .../base/sparql-1.1/group/03-quads.sparql     |   7 +
 .../base/sparql-1.1/group/04-quads.sparql     |   8 +
 ...h-sets-have-the-same-elements-quads.sparql |  27 ++
 ...imity-by-exclusion-not-exists-quads.sparql |  13 +
 .../negation/simple-minus-quads.sparql        |   6 +
 ...us-from-a-fully-bound-minuend-quads.sparql |  14 +
 ...rom-a-partially-bound-minuend-quads.sparql |  19 +
 .../paths/01-simple-path-quads.sparql         |   5 +
 .../paths/02-star-path-quads.sparql           |   3 +
 .../paths/08-reverse-path-quads.sparql        |   3 +
 .../09-reverse-sequence-path-quads.sparql     |   4 +
 .../paths/10-path-with-negation-quads.sparql  |   3 +
 ...two-paths-to-same-target-node-quads.sparql |   3 +
 .../paths/14-star-path-over-foaf-quads.sparql |   4 +
 .../14-star-path-over-foafknows-quads.sparql  |   4 +
 .../paths/28a-diamond-with-loop-quads.sparql  |   3 +
 .../30-operator-precedence-1-quads.sparql     |   3 +
 .../31-operator-precedence-2-quads.sparql     |   4 +
 .../32-operator-precedence-3-quads.sparql     |   3 +
 .../33-operator-precedence-4-quads.sparql     |   3 +
 .../sparql-1.1/paths/37-nested-quads.sparql   |   4 +
 .../sparql-1.1/paths/path-union-quads.sparql  |   9 +
 .../sparql-1.1/service/service01-quads.sparql |   6 +
 .../sparql-1.1/service/service02-quads.sparql |  10 +
 .../sparql-1.1/service/service03-quads.sparql |  10 +
 .../sparql-1.1/service/service04-quads.sparql |  11 +
 .../sparql-1.1/service/service05-quads.sparql |  10 +
 .../sparql-1.1/service/service06-quads.sparql |  10 +
 .../sparql-1.1/service/service07-quads.sparql |   6 +
 .../subqueries/06-subquery-quads.sparql       |   5 +
 .../08-subquery-with-aggregate-quads.sparql   |   8 +
 .../09-nested-subqueries-quads.sparql         |  10 +
 ...1-subquery-limit-per-resource-quads.sparql |  12 +
 .../syntax/aggregate-15-quads.sparql          |   2 +
 .../sparql-1.1/syntax/bindscope1-quads.sparql |   7 +
 .../syntax/syntax-oneof-01-quads.sparql       |   4 +
 .../syntax/syntax-oneof-03-quads.sparql       |   4 +
 .../syntax/syntax-subquery-02-quads.sparql    |   5 +
 .../sparql-1.1/values/01-bind-quads.sparql    |   7 +
 ...h-2-obj-vars-1-row-with-undef-quads.sparql |   7 +
 ...-2-obj-vars-2-rows-with-undef-quads.sparql |   8 +
 ...s-with-optional-obj-var-1-row-quads.sparql |   9 +
 ...ry-values-with-subj-var-1-row-quads.sparql |   7 +
 .../values/post-subquery-values-quads.sparql  |   8 +
 .../values/values-many-once-quads.sparql      |   5 +
 .../describe/16.4.1-quads.sparql              |   2 +
 .../describe/16.4.2a-quads.sparql             |   3 +
 .../describe/16.4.2c-quads.sparql             |   3 +
 .../describe/star-empty-quads.sparql          |   2 +
 .../sparql11-query/describe/star-quads.sparql |   3 +
 .../base/sparql11-query/empty-quads.sparql    |   0
 .../existence-subquery-quads.sparql           |  12 +
 .../sparql11-query/filter-union-quads.sparql  |   8 +
 .../sparql11-query/from/13.2.1-quads.sparql   |   3 +
 .../sparql11-query/from/13.2.2-quads.sparql   |   3 +
 .../sparql11-query/from/13.2.3-quads.sparql   |   6 +
 .../sparql11-query/from/13.3.1-quads.sparql   |   6 +
 .../sparql11-query/from/13.3.2-quads.sparql   |   6 +
 .../sparql11-query/from/13.3.3-quads.sparql   |  13 +
 .../sparql11-query/from/13.3.4-quads.sparql   |   8 +
 .../group-by-no-var-quads.sparql              |   5 +
 .../sparql11-query/negate-and-quads.sparql    |   5 +
 .../sparql11-query/negated-path-quads.sparql  |   4 +
 .../sparql11-query/nested-union-quads.sparql  |  20 +
 .../path-inverse-negation-quads.sparql        |   3 +
 .../project-filter-quads.sparql               |  10 +
 .../sparql11-query/unused-extend-quads.sparql |   5 +
 .../update/clear-drop-quads.sparql            |  12 +
 .../update/load-into-quads.sparql             |   1 +
 .../sparql11-query/update/load-quads.sparql   |   1 +
 .../update/sparql-update-3-2-3-quads.sparql   |   1 +
 .../update/sparql-update-3-2-4-quads.sparql   |   1 +
 .../update/sparql-update-3-2-5-quads.sparql   |   1 +
 .../sparql-1-2-ar-langdir-quads.sparql        |   3 +
 .../sparql12/sparql-1-2-ar-langdir.sparql     |   2 +-
 .../sparql-1-2-en-langdir-quads.sparql        |   3 +
 .../sparql12/sparql-1-2-en-langdir.sparql     |   2 +-
 .../dawg-syntax/basic/01-quads.sparql         |   2 +
 .../dawg-syntax/basic/02-quads.sparql         |   2 +
 .../dawg-syntax/basic/03-quads.sparql         |   3 +
 .../dawg-syntax/basic/04-quads.sparql         |   3 +
 .../dawg-syntax/basic/05-quads.sparql         |   4 +
 .../dawg-syntax/basic/06-quads.sparql         |   4 +
 .../dawg-syntax/bnodes/01-quads.sparql        |   3 +
 .../dawg-syntax/bnodes/02-quads.sparql        |   3 +
 .../dawg-syntax/bnodes/03-quads.sparql        |   5 +
 .../dawg-syntax/bnodes/04-quads.sparql        |   3 +
 .../dawg-syntax/bnodes/05-quads.sparql        |   4 +
 .../dawg-syntax/bnodes/06-clash-quads.sparql  |   5 +
 .../dawg-syntax/expr/01-quads.sparql          |   4 +
 .../dawg-syntax/expr/02-quads.sparql          |   4 +
 .../dawg-syntax/expr/03-quads.sparql          |   4 +
 .../dawg-syntax/expr/04-quads.sparql          |   4 +
 .../dawg-syntax/expr/05-quads.sparql          |   4 +
 .../dawg-syntax/forms/01-quads.sparql         |  11 +
 .../dawg-syntax/forms/02-quads.sparql         |   6 +
 .../dawg-syntax/limit-offset/01-quads.sparql  |   5 +
 .../dawg-syntax/limit-offset/02-quads.sparql  |   5 +
 .../dawg-syntax/limit-offset/03-quads.sparql  |   5 +
 .../dawg-syntax/limit-offset/04-quads.sparql  |   5 +
 .../dawg-syntax/lists/01-quads.sparql         |   5 +
 .../dawg-syntax/lists/02-quads.sparql         |   5 +
 .../dawg-syntax/lists/03-quads.sparql         |   4 +
 .../dawg-syntax/lists/04-quads.sparql         |   6 +
 .../dawg-syntax/lists/05-quads.sparql         |   4 +
 .../dawg-syntax/lit/01-quads.sparql           |   3 +
 .../dawg-syntax/lit/02-quads.sparql           |   3 +
 .../dawg-syntax/lit/03-quads.sparql           |   3 +
 .../dawg-syntax/lit/04-quads.sparql           |   3 +
 .../dawg-syntax/lit/05-quads.sparql           |   3 +
 .../dawg-syntax/lit/06-quads.sparql           |   3 +
 .../dawg-syntax/lit/07-quads.sparql           |   3 +
 .../dawg-syntax/lit/08-quads.sparql           |   3 +
 .../dawg-syntax/lit/09-quads.sparql           |   3 +
 .../dawg-syntax/lit/10-quads.sparql           |   3 +
 .../dawg-syntax/lit/11-quads.sparql           |   3 +
 .../dawg-syntax/lit/12-quads.sparql           |   3 +
 .../dawg-syntax/lit/13-quads.sparql           |   3 +
 .../dawg-syntax/lit/14-quads.sparql           |   3 +
 .../dawg-syntax/lit/15-quads.sparql           |   3 +
 .../dawg-syntax/lit/16-quads.sparql           |   3 +
 .../dawg-syntax/lit/17-quads.sparql           |   3 +
 .../dawg-syntax/lit/18-quads.sparql           |   3 +
 .../dawg-syntax/lit/19-quads.sparql           |   3 +
 .../dawg-syntax/lit/20-quads.sparql           |   3 +
 .../dawg-syntax/opt-filter/01-quads.sparql    |   7 +
 .../dawg-syntax/opt-filter/02-quads.sparql    |   7 +
 .../dawg-syntax/order/01-quads.sparql         |   4 +
 .../dawg-syntax/order/02-quads.sparql         |   4 +
 .../dawg-syntax/order/03-quads.sparql         |   4 +
 .../dawg-syntax/order/04-quads.sparql         |   4 +
 .../dawg-syntax/order/05-quads.sparql         |   4 +
 .../dawg-syntax/order/06-quads.sparql         |   4 +
 .../dawg-syntax/order/07-quads.sparql         |   4 +
 .../dawg-syntax/pat/01-quads.sparql           |   2 +
 .../dawg-syntax/pat/02-quads.sparql           |   7 +
 .../dawg-syntax/pat/03-quads.sparql           |  12 +
 .../dawg-syntax/reduced/01-quads.sparql       |   3 +
 .../dawg-syntax/struct/01-quads.sparql        |   4 +
 .../dawg-syntax/struct/02-quads.sparql        |   5 +
 .../dawg-syntax/struct/13-quads.sparql        |  10 +
 .../aggregates/agg-empty-group-quads.sparql   |   4 +
 .../sparql-1.1/aggregates/avg-quads.sparql    |   3 +
 .../aggregates/avg-with-group-by-quads.sparql |   5 +
 .../aggregates/count-3-quads.sparql           |   5 +
 .../aggregates/count-8b-quads.sparql          |   7 +
 .../aggregates/error-in-avg-quads.sparql      |   4 +
 .../aggregates/group-concat-1-quads.sparql    |   8 +
 .../aggregates/group-concat-2-quads.sparql    |   9 +
 .../group-concat-with-separator-quads.sparql  |   8 +
 .../protect-from-error-in-avg-quads.sparql    |   4 +
 .../sparql-1.1/aggregates/sample-quads.sparql |   8 +
 .../ask/group-concat-1-quads.sparql           |   8 +
 .../sparql-1.1/ask/in-1-quads.sparql          |   3 +
 .../sparql-1.1/ask/not-in-1-quads.sparql      |   3 +
 ...undistinguished-variable-test-quads.sparql |   3 +
 ...-of-undistinguished-variables-quads.sparql |   6 +
 .../sparql-1.1/ask/syn-pname-01-quads.sparql  |   2 +
 .../sparql-1.1/bind/01-quads.sparql           |   3 +
 .../sparql-1.1/bind/02-quads.sparql           |   3 +
 .../sparql-1.1/bind/03-quads.sparql           |   7 +
 .../sparql-1.1/bind/04-quads.sparql           |   3 +
 .../sparql-1.1/bind/05-quads.sparql           |   7 +
 .../sparql-1.1/bind/07-quads.sparql           |   9 +
 .../sparql-1.1/bind/08-quads.sparql           |   7 +
 .../sparql-1.1/bind/10-quads.sparql           |   9 +
 .../sparql-1.1/bind/11-quads.sparql           |   7 +
 .../construct/construct-from-quads.sparql     |   7 +
 .../construct/construct-slice-quads.sparql    |   7 +
 .../construct/constructwhere01-quads.sparql   |   6 +
 .../construct/constructwhere02-quads.sparql   |   8 +
 .../construct/constructwhere03-quads.sparql   |   8 +
 .../constructwhere05-modified-quads.sparql    |   9 +
 .../construct/constructwhere06-quads.sparql   |   6 +
 ...ive-exists-in-positive-exists-quads.sparql |  13 +
 .../nested-positive-exists-quads.sparql       |  13 +
 .../functions/bnode-str-quads.sparql          |   5 +
 .../sparql-1.1/functions/now-quads.sparql     |   6 +
 .../functions/strlang-str-quads.sparql        |   4 +
 .../sparql-1.1/group/01-quads.sparql          |   4 +
 .../sparql-1.1/group/03-quads.sparql          |   7 +
 .../sparql-1.1/group/04-quads.sparql          |   8 +
 ...h-sets-have-the-same-elements-quads.sparql |  27 ++
 ...imity-by-exclusion-not-exists-quads.sparql |  13 +
 .../negation/simple-minus-quads.sparql        |   6 +
 ...us-from-a-fully-bound-minuend-quads.sparql |  14 +
 ...rom-a-partially-bound-minuend-quads.sparql |  19 +
 .../paths/01-simple-path-quads.sparql         |   5 +
 .../paths/02-star-path-quads.sparql           |   3 +
 .../paths/08-reverse-path-quads.sparql        |   3 +
 .../09-reverse-sequence-path-quads.sparql     |   4 +
 .../paths/10-path-with-negation-quads.sparql  |   3 +
 ...two-paths-to-same-target-node-quads.sparql |   3 +
 .../paths/14-star-path-over-foaf-quads.sparql |   4 +
 .../14-star-path-over-foafknows-quads.sparql  |   4 +
 .../paths/28a-diamond-with-loop-quads.sparql  |   3 +
 .../30-operator-precedence-1-quads.sparql     |   3 +
 .../31-operator-precedence-2-quads.sparql     |   4 +
 .../32-operator-precedence-3-quads.sparql     |   3 +
 .../33-operator-precedence-4-quads.sparql     |   3 +
 .../sparql-1.1/paths/37-nested-quads.sparql   |   4 +
 .../sparql-1.1/paths/path-union-quads.sparql  |   9 +
 .../sparql-1.1/service/service01-quads.sparql |   6 +
 .../sparql-1.1/service/service02-quads.sparql |  10 +
 .../sparql-1.1/service/service03-quads.sparql |  10 +
 .../sparql-1.1/service/service04-quads.sparql |  11 +
 .../sparql-1.1/service/service05-quads.sparql |  10 +
 .../sparql-1.1/service/service06-quads.sparql |  10 +
 .../sparql-1.1/service/service07-quads.sparql |   6 +
 .../subqueries/06-subquery-quads.sparql       |   5 +
 .../08-subquery-with-aggregate-quads.sparql   |   8 +
 .../09-nested-subqueries-quads.sparql         |  10 +
 ...1-subquery-limit-per-resource-quads.sparql |  12 +
 .../syntax/aggregate-15-quads.sparql          |   2 +
 .../sparql-1.1/syntax/bindscope1-quads.sparql |   7 +
 .../syntax/syntax-oneof-01-quads.sparql       |   4 +
 .../syntax/syntax-oneof-03-quads.sparql       |   4 +
 .../syntax/syntax-subquery-02-quads.sparql    |   5 +
 .../sparql-1.1/values/01-bind-quads.sparql    |   7 +
 ...h-2-obj-vars-1-row-with-undef-quads.sparql |   7 +
 ...-2-obj-vars-2-rows-with-undef-quads.sparql |   8 +
 ...s-with-optional-obj-var-1-row-quads.sparql |   9 +
 ...ry-values-with-subj-var-1-row-quads.sparql |   7 +
 .../values/post-subquery-values-quads.sparql  |   8 +
 .../values/values-many-once-quads.sparql      |   5 +
 .../describe/16.4.1-quads.sparql              |   2 +
 .../describe/16.4.2a-quads.sparql             |   3 +
 .../describe/16.4.2c-quads.sparql             |   3 +
 .../describe/star-empty-quads.sparql          |   2 +
 .../sparql11-query/describe/star-quads.sparql |   3 +
 .../sparql11-query/empty-quads.sparql         |   0
 .../existence-subquery-quads.sparql           |  12 +
 .../sparql11-query/filter-union-quads.sparql  |   8 +
 .../sparql11-query/from/13.2.1-quads.sparql   |   3 +
 .../sparql11-query/from/13.2.2-quads.sparql   |   3 +
 .../sparql11-query/from/13.2.3-quads.sparql   |   6 +
 .../sparql11-query/from/13.3.1-quads.sparql   |   6 +
 .../sparql11-query/from/13.3.2-quads.sparql   |   6 +
 .../sparql11-query/from/13.3.3-quads.sparql   |  13 +
 .../sparql11-query/from/13.3.4-quads.sparql   |   8 +
 .../group-by-no-var-quads.sparql              |   5 +
 .../sparql11-query/negate-and-quads.sparql    |   5 +
 .../sparql11-query/negated-path-quads.sparql  |   4 +
 .../sparql11-query/nested-union-quads.sparql  |  20 +
 .../path-inverse-negation-quads.sparql        |   3 +
 .../project-filter-quads.sparql               |  10 +
 .../sparql11-query/unused-extend-quads.sparql |   5 +
 .../update/clear-drop-quads.sparql            |  12 +
 .../update/load-into-quads.sparql             |   1 +
 .../sparql11-query/update/load-quads.sparql   |   1 +
 .../update/sparql-update-3-2-3-quads.sparql   |   1 +
 .../update/sparql-update-3-2-4-quads.sparql   |   1 +
 .../update/sparql-update-3-2-5-quads.sparql   |   1 +
 .../sparql-1-2-ar-langdir-quads.sparql        |   3 +
 .../sparql12/sparql-1-2-ar-langdir.sparql     |   2 +-
 .../sparql-1-2-en-langdir-quads.sparql        |   3 +
 .../sparql12/sparql-1-2-en-langdir.sparql     |   2 +-
 724 files changed, 29368 insertions(+), 60 deletions(-)
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/06-clash-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/forms/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/forms/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/07-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/08-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/09-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/10-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/11-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/12-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/13-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/14-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/15-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/16-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/17-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/18-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/19-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/20-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/opt-filter/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/opt-filter/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/07-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/reduced/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/13-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/agg-empty-group-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/avg-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/avg-with-group-by-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/count-3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/count-8b-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/error-in-avg-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-2-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-with-separator-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/protect-from-error-in-avg-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/sample-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/group-concat-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/in-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/not-in-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/syn-pname-01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/07-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/08-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/10-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/11-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/construct-from-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/construct-slice-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere05-modified-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/exists/nested-positive-exists-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/bnode-str-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/now-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/strlang-str-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/simple-minus-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/01-simple-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/02-star-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/08-reverse-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/09-reverse-sequence-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/10-path-with-negation-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/14-star-path-over-foaf-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/14-star-path-over-foafknows-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/28a-diamond-with-loop-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/30-operator-precedence-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/31-operator-precedence-2-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/32-operator-precedence-3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/33-operator-precedence-4-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/37-nested-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/path-union-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service07-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/06-subquery-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/09-nested-subqueries-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/aggregate-15-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/bindscope1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-oneof-01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-oneof-03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-subquery-02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/01-bind-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-subquery-values-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/values-many-once-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.2a-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.2c-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/star-empty-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/star-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/empty-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/existence-subquery-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/filter-union-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.2-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.2-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.4-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/group-by-no-var-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/negate-and-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/negated-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/nested-union-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/path-inverse-negation-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/project-filter-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/unused-extend-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/clear-drop-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/load-into-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/load-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-4-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-5-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-ar-langdir-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-en-langdir-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/06-clash-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/forms/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/forms/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/07-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/08-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/09-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/10-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/11-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/12-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/13-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/14-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/15-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/16-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/17-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/18-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/19-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/20-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/opt-filter/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/opt-filter/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/order/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/order/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/order/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/order/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/order/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/order/06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/order/07-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/reduced/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/13-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/agg-empty-group-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/avg-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/avg-with-group-by-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/count-3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/count-8b-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/error-in-avg-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-2-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-with-separator-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/protect-from-error-in-avg-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/sample-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/group-concat-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/in-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/not-in-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/syn-pname-01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/07-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/08-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/10-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/11-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/construct-from-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/construct-slice-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere05-modified-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/exists/nested-positive-exists-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/bnode-str-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/now-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/strlang-str-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/group/01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/group/03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/group/04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/simple-minus-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/01-simple-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/02-star-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/08-reverse-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/09-reverse-sequence-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/10-path-with-negation-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/14-star-path-over-foaf-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/14-star-path-over-foafknows-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/28a-diamond-with-loop-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/30-operator-precedence-1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/31-operator-precedence-2-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/32-operator-precedence-3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/33-operator-precedence-4-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/37-nested-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/path-union-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service04-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service05-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service06-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service07-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/06-subquery-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/09-nested-subqueries-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/aggregate-15-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/bindscope1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-oneof-01-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-oneof-03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-subquery-02-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/values/01-bind-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-subquery-values-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/values/values-many-once-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.2a-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.2c-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/describe/star-empty-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/describe/star-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/empty-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/existence-subquery-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/filter-union-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.2-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.1-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.2-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.4-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/group-by-no-var-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/negate-and-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/negated-path-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/nested-union-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/path-inverse-negation-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/project-filter-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/unused-extend-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/clear-drop-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/load-into-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/load-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-3-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-4-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-5-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-ar-langdir-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-en-langdir-quads.json
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/06-clash-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/forms/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/forms/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/07-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/08-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/09-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/10-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/11-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/12-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/13-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/14-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/15-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/16-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/17-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/18-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/19-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/20-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/opt-filter/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/opt-filter/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/07-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/reduced/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/13-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/agg-empty-group-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/avg-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/avg-with-group-by-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/count-3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/count-8b-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/error-in-avg-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-2-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-with-separator-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/protect-from-error-in-avg-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/sample-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/group-concat-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/in-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/not-in-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/syn-pname-01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/07-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/08-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/10-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/11-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/construct-from-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/construct-slice-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere05-modified-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/exists/nested-positive-exists-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/bnode-str-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/now-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/strlang-str-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/simple-minus-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/01-simple-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/02-star-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/08-reverse-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/09-reverse-sequence-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/10-path-with-negation-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/14-star-path-over-foaf-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/14-star-path-over-foafknows-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/28a-diamond-with-loop-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/30-operator-precedence-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/31-operator-precedence-2-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/32-operator-precedence-3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/33-operator-precedence-4-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/37-nested-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/path-union-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service07-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/06-subquery-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/09-nested-subqueries-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/aggregate-15-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/bindscope1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-oneof-01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-oneof-03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-subquery-02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/01-bind-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-subquery-values-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/values-many-once-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.2a-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.2c-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/star-empty-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/star-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/empty-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/existence-subquery-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/filter-union-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.2-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.2-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.4-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/group-by-no-var-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/negate-and-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/negated-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/nested-union-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/path-inverse-negation-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/project-filter-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/unused-extend-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/clear-drop-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/load-into-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/load-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-4-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-5-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-ar-langdir-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-en-langdir-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/06-clash-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/forms/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/forms/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/07-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/08-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/09-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/10-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/11-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/12-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/13-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/14-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/15-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/16-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/17-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/18-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/19-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/20-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/opt-filter/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/opt-filter/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/07-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/reduced/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/13-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/agg-empty-group-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/avg-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/avg-with-group-by-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/count-3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/count-8b-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/error-in-avg-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-2-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-with-separator-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/protect-from-error-in-avg-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/sample-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/group-concat-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/in-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/not-in-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/syn-pname-01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/07-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/08-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/10-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/11-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/construct-from-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/construct-slice-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere05-modified-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/exists/nested-positive-exists-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/bnode-str-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/now-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/strlang-str-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/simple-minus-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/01-simple-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/02-star-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/08-reverse-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/09-reverse-sequence-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/10-path-with-negation-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/14-star-path-over-foaf-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/14-star-path-over-foafknows-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/28a-diamond-with-loop-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/30-operator-precedence-1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/31-operator-precedence-2-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/32-operator-precedence-3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/33-operator-precedence-4-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/37-nested-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/path-union-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service04-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service05-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service06-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service07-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/06-subquery-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/09-nested-subqueries-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/aggregate-15-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/bindscope1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-oneof-01-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-oneof-03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-subquery-02-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/01-bind-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-subquery-values-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/values-many-once-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.2a-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.2c-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/star-empty-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/star-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/empty-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/existence-subquery-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/filter-union-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.2-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.1-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.2-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.4-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/group-by-no-var-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/negate-and-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/negated-path-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/nested-union-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/path-inverse-negation-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/project-filter-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/unused-extend-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/clear-drop-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/load-into-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/load-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-3-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-4-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-5-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-ar-langdir-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-en-langdir-quads.sparql

diff --git a/engines/algebra-sparql-1-1/test/extraCoverage.test.ts b/engines/algebra-sparql-1-1/test/extraCoverage.test.ts
index 90e5048c..cb43ce0e 100644
--- a/engines/algebra-sparql-1-1/test/extraCoverage.test.ts
+++ b/engines/algebra-sparql-1-1/test/extraCoverage.test.ts
@@ -76,16 +76,14 @@ GROUP BY ( ?y AS ?x )`);
       const result = algebraUtils.objectify(toAlgebra(ast, { quads: false }));
       expect(result).toMatchObject({
         type: 'deleteinsert',
-        insert: [
-          {
-            type: 'pattern',
-            termType: 'Quad',
-            subject: { termType: 'NamedNode', value: 'http://s' },
-            predicate: { termType: 'NamedNode', value: 'http://p' },
-            object: { termType: 'NamedNode', value: 'http://o' },
-            graph: { termType: 'DefaultGraph', value: '' },
-          },
-        ],
+        insert: [{
+          type: 'pattern',
+          termType: 'Quad',
+          subject: { termType: 'NamedNode', value: 'http://s' },
+          predicate: { termType: 'NamedNode', value: 'http://p' },
+          object: { termType: 'NamedNode', value: 'http://o' },
+          graph: { termType: 'DefaultGraph', value: '' },
+        }],
       });
     });
   });
diff --git a/engines/algebra-sparql-1-2/test/generateJson.test.ts b/engines/algebra-sparql-1-2/test/generateJson.test.ts
index f8e061f3..123e5b3b 100644
--- a/engines/algebra-sparql-1-2/test/generateJson.test.ts
+++ b/engines/algebra-sparql-1-2/test/generateJson.test.ts
@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
 import { join, sep } from 'node:path';
-import { algebraUtils } from '@traqula/algebra-transformations-1-1';
+import { algebraUtils } from '@traqula/algebra-transformations-1-2';
 import { Generator } from '@traqula/generator-sparql-1-2';
 import { Parser } from '@traqula/parser-sparql-1-2';
 import { AstFactory } from '@traqula/rules-sparql-1-2';
diff --git a/packages/algebra-transformations-1-1/lib/toAlgebra/updates.ts b/packages/algebra-transformations-1-1/lib/toAlgebra/updates.ts
index d19f4926..6e302748 100644
--- a/packages/algebra-transformations-1-1/lib/toAlgebra/updates.ts
+++ b/packages/algebra-transformations-1-1/lib/toAlgebra/updates.ts
@@ -89,6 +89,8 @@ Algebra.Update,
 > = {
   name: 'translateInsertDelete',
   fun: ({ SUBRULE }) => ({ algebraFactory: AF, astFactory: F, useQuads }, op) => {
+    // `useQuads: false` is supported in update queries,
+    // but within the target, the quad push down is still performed.
     const deleteTriples: Algebra.Pattern[] = [];
     const insertTriples: Algebra.Pattern[] = [];
     let where: Algebra.Operation | undefined;
diff --git a/packages/test-utils/lib/generators/algebraGenerators.ts b/packages/test-utils/lib/generators/algebraGenerators.ts
index bbef1199..ee3c83a1 100644
--- a/packages/test-utils/lib/generators/algebraGenerators.ts
+++ b/packages/test-utils/lib/generators/algebraGenerators.ts
@@ -1,5 +1,5 @@
 /* eslint-disable import/no-nodejs-modules */
-import { existsSync, lstatSync, readdirSync } from 'node:fs';
+import { lstatSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
 import { readFile, readFileSync } from '../fileUtils.js';
 import type { NegativeTest } from './generators.js';
@@ -38,56 +38,42 @@ Generator<algebraTestGen>;
 export function* sparqlAlgebraTests(suite: AlgebraTestSuite, blankToVariable: boolean, getSPARQL: boolean):
 Generator<algebraTestGen> {
   const jsonRoot = blankToVariable ? rootJsonBlankToVariable : rootJson;
-  const canonicalRoot = blankToVariable ? rootCanonicalSparqlBlankToVar : rootCanonicalSparql;
 
-  // Collect all unique base names (relative paths without `-quads` suffix and `.json` extension)
-  // that have a base (non-quads) JSON file
-  function collectBaseNames(relativePath: string, result: Set<string>): void {
-    const absolutePath = join(jsonRoot, relativePath);
+  // Relative path starting from roots declared above.
+  function* subGen(relativePath: string): Generator<algebraTestGen> {
+    const absolutePath = join(rootSparql, relativePath);
     if (lstatSync(absolutePath).isDirectory()) {
+      // Recursion
       for (const sub of readdirSync(absolutePath)) {
-        collectBaseNames(join(relativePath, sub), result);
+        // Relative path appended with sub
+        yield* subGen(join(relativePath, sub));
       }
-    } else if (!relativePath.endsWith('-quads.json')) {
-      result.add(relativePath.replace(/\.json$/u, ''));
-    }
-  }
-
-  function* yieldForBase(baseName: string): Generator<algebraTestGen> {
-    const quadsJsonPath = join(jsonRoot, `${baseName}-quads.json`);
-    const sparqlPath = join(rootSparql, `${baseName}.sparql`);
-    const canonicalPath = join(canonicalRoot, `${baseName}.sparql`);
+    } else {
+      // Emit tests
+      const baseName = relativePath.replace(/\.sparql$/u, '');
 
-    // Yield quads: false variant (base JSON always exists since collectBaseNames filters for it)
-    yield {
-      name: baseName,
-      json: JSON.parse(readFileSync(join(jsonRoot, `${baseName}.json`))),
-      quads: false,
-      sparql: getSPARQL ? readFileSync(sparqlPath, 'utf-8') : undefined,
-      canonicalSparql: getSPARQL ? readFileSync(canonicalPath, 'utf-8') : undefined,
-    };
+      for (const suffix of [ '', '-quads' ]) {
+        const name = `${baseName}${suffix}`;
+        const jsonPath = join(jsonRoot, `${name}.json`);
+        const canonicalSparqlPath = join(
+          blankToVariable ? rootCanonicalSparqlBlankToVar : rootCanonicalSparql,
+            `${name}.sparql`,
+        );
 
-    // Yield quads: true variant if the quads JSON exists
-    if (existsSync(quadsJsonPath)) {
-      const canonicalQuadsPath = join(canonicalRoot, `${baseName}-quads.sparql`);
-      yield {
-        name: `${baseName}-quads`,
-        json: JSON.parse(readFileSync(quadsJsonPath)),
-        quads: true,
-        sparql: getSPARQL ? readFileSync(sparqlPath, 'utf-8') : undefined,
-        canonicalSparql: getSPARQL ? readFileSync(canonicalQuadsPath, 'utf-8') : undefined,
-      };
+        yield {
+          name,
+          json: JSON.parse(readFileSync(jsonPath)),
+          sparql: getSPARQL ? readFileSync(absolutePath, 'utf8') : undefined,
+          canonicalSparql: getSPARQL ? readFileSync(canonicalSparqlPath, 'utf-8') : undefined,
+          quads: suffix === '-quads',
+        };
+      }
     }
   }
 
-  const subfolders = readdirSync(jsonRoot);
+  const subfolders = readdirSync(rootSparql);
   if (subfolders.includes(suite)) {
-    const baseNames = new Set<string>();
-    collectBaseNames(suite, baseNames);
-    const sorted = [ ...baseNames ].sort();
-    for (const baseName of sorted) {
-      yield* yieldForBase(baseName);
-    }
+    yield* subGen(suite);
   }
 }
 
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/01-quads.json
new file mode 100644
index 00000000..f7112b5a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/01-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/02-quads.json
new file mode 100644
index 00000000..f7112b5a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/02-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/03-quads.json
new file mode 100644
index 00000000..503eb4f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/03-quads.json
@@ -0,0 +1,42 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/04-quads.json
new file mode 100644
index 00000000..503eb4f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/04-quads.json
@@ -0,0 +1,42 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/05-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/05-quads.json
new file mode 100644
index 00000000..0b1a5bbf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/05-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "a"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/06-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/06-quads.json
new file mode 100644
index 00000000..0b1a5bbf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/basic/06-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "a"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/01-quads.json
new file mode 100644
index 00000000..93f5d857
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/01-quads.json
@@ -0,0 +1,29 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/02-quads.json
new file mode 100644
index 00000000..93f5d857
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/02-quads.json
@@ -0,0 +1,29 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/03-quads.json
new file mode 100644
index 00000000..ef2ceefd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/03-quads.json
@@ -0,0 +1,86 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "pa"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "pa"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/04-quads.json
new file mode 100644
index 00000000..93f5d857
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/04-quads.json
@@ -0,0 +1,29 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/05-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/05-quads.json
new file mode 100644
index 00000000..c040eb7f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/05-quads.json
@@ -0,0 +1,49 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p1"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p2"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/06-clash-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/06-clash-quads.json
new file mode 100644
index 00000000..1aeb709f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/bnodes/06-clash-quads.json
@@ -0,0 +1,82 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_b"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_b"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_b0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "b0"
+    },
+    {
+      "termType": "Variable",
+      "value": "b1"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/01-quads.json
new file mode 100644
index 00000000..52591fc4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/01-quads.json
@@ -0,0 +1,53 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "o"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/02-quads.json
new file mode 100644
index 00000000..e00f8267
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/02-quads.json
@@ -0,0 +1,72 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "regex",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "foo",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/03-quads.json
new file mode 100644
index 00000000..1e0bb985
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/03-quads.json
@@ -0,0 +1,85 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "regex",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "foo",
+            "language": "en",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "i",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/04-quads.json
new file mode 100644
index 00000000..3d41b23f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/04-quads.json
@@ -0,0 +1,63 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "named",
+      "name": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/2001/XMLSchema#integer"
+      },
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/05-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/05-quads.json
new file mode 100644
index 00000000..2608b3f4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/expr/05-quads.json
@@ -0,0 +1,71 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "named",
+      "name": {
+        "termType": "NamedNode",
+        "value": "http://example.org/ns#myFunc"
+      },
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "s"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/forms/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/forms/01-quads.json
new file mode 100644
index 00000000..f48844af
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/forms/01-quads.json
@@ -0,0 +1,210 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "pa"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_4"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_4"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "57",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#integer"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_4"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "pa"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/forms/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/forms/02-quads.json
new file mode 100644
index 00000000..41a28ed0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/forms/02-quads.json
@@ -0,0 +1,89 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/01-quads.json
new file mode 100644
index 00000000..0128d13b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/01-quads.json
@@ -0,0 +1,60 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "orderby",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expressions": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "start": 0,
+  "length": 5
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/02-quads.json
new file mode 100644
index 00000000..bc85510a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/02-quads.json
@@ -0,0 +1,60 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "orderby",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expressions": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "start": 3,
+  "length": 5
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/03-quads.json
new file mode 100644
index 00000000..bc85510a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/03-quads.json
@@ -0,0 +1,60 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "orderby",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expressions": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "start": 3,
+  "length": 5
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/04-quads.json
new file mode 100644
index 00000000..a5255065
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/limit-offset/04-quads.json
@@ -0,0 +1,59 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "orderby",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expressions": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "start": 3
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/01-quads.json
new file mode 100644
index 00000000..d8c13710
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/01-quads.json
@@ -0,0 +1,78 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/02-quads.json
new file mode 100644
index 00000000..250ca4b9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/02-quads.json
@@ -0,0 +1,78 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/03-quads.json
new file mode 100644
index 00000000..13adc631
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/03-quads.json
@@ -0,0 +1,54 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/04-quads.json
new file mode 100644
index 00000000..ef1c69db
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/04-quads.json
@@ -0,0 +1,94 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/05-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/05-quads.json
new file mode 100644
index 00000000..5fabed5d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lists/05-quads.json
@@ -0,0 +1,49 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/01-quads.json
new file mode 100644
index 00000000..8aa2feb7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/01-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/02-quads.json
new file mode 100644
index 00000000..8aa2feb7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/02-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/03-quads.json
new file mode 100644
index 00000000..373b8701
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/03-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x\"y'z",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/04-quads.json
new file mode 100644
index 00000000..373b8701
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/04-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x\"y'z",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/05-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/05-quads.json
new file mode 100644
index 00000000..f0cde265
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/05-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x\"",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/06-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/06-quads.json
new file mode 100644
index 00000000..3ec541ea
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/06-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x'",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/07-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/07-quads.json
new file mode 100644
index 00000000..fe51fd0c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/07-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "123",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#integer"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/08-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/08-quads.json
new file mode 100644
index 00000000..fe51fd0c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/08-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "123",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#integer"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/09-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/09-quads.json
new file mode 100644
index 00000000..34b5894c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/09-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\n\"\"\nLiteral\n",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/10-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/10-quads.json
new file mode 100644
index 00000000..97bc2ef7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/10-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\n'' \"\"\"\nLiteral\n",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/11-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/11-quads.json
new file mode 100644
index 00000000..700fbacb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/11-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\"\"\"Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/12-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/12-quads.json
new file mode 100644
index 00000000..1f3f1edf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/12-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long'''Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/13-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/13-quads.json
new file mode 100644
index 00000000..700fbacb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/13-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\"\"\"Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/14-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/14-quads.json
new file mode 100644
index 00000000..1f3f1edf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/14-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long'''Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/15-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/15-quads.json
new file mode 100644
index 00000000..db5350c5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/15-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long '' Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/16-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/16-quads.json
new file mode 100644
index 00000000..f47a4a6d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/16-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long ' Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/17-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/17-quads.json
new file mode 100644
index 00000000..3acdf11e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/17-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long''\\Literal with '\\ single quotes ",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/18-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/18-quads.json
new file mode 100644
index 00000000..5dfa5f4a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/18-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long \"\" Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/19-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/19-quads.json
new file mode 100644
index 00000000..ea5bd788
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/19-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long \" Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/20-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/20-quads.json
new file mode 100644
index 00000000..951638b1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/lit/20-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\"\"\\Literal with \"\\ single quotes",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/opt-filter/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/opt-filter/01-quads.json
new file mode 100644
index 00000000..8f3f0c5c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/opt-filter/01-quads.json
@@ -0,0 +1,103 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example/p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "v"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "y"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example/q"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "w"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ],
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "v"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "v"
+    },
+    {
+      "termType": "Variable",
+      "value": "w"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/opt-filter/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/opt-filter/02-quads.json
new file mode 100644
index 00000000..6ee01438
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/opt-filter/02-quads.json
@@ -0,0 +1,137 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example/p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "v"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "y"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example/q"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "w"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ],
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "&&",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "v"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "2",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "w"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "3",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "v"
+    },
+    {
+      "termType": "Variable",
+      "value": "w"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/01-quads.json
new file mode 100644
index 00000000..54490640
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/01-quads.json
@@ -0,0 +1,55 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "o"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/02-quads.json
new file mode 100644
index 00000000..dd075c68
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/02-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "+",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "5",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/03-quads.json
new file mode 100644
index 00000000..54490640
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/03-quads.json
@@ -0,0 +1,55 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "o"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/04-quads.json
new file mode 100644
index 00000000..d9db9c40
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/04-quads.json
@@ -0,0 +1,62 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "desc",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/05-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/05-quads.json
new file mode 100644
index 00000000..106079c5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/05-quads.json
@@ -0,0 +1,80 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "desc",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "named",
+            "name": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#func"
+            },
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "s"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/06-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/06-quads.json
new file mode 100644
index 00000000..313944f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/06-quads.json
@@ -0,0 +1,107 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "desc",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "+",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Literal",
+                  "value": "57",
+                  "datatype": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/2001/XMLSchema#integer"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "expression",
+        "subType": "named",
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#func2"
+        },
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          }
+        ]
+      },
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "s"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/07-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/07-quads.json
new file mode 100644
index 00000000..49b1ad51
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/order/07-quads.json
@@ -0,0 +1,62 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "str",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/01-quads.json
new file mode 100644
index 00000000..f7112b5a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/01-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/02-quads.json
new file mode 100644
index 00000000..048c81ef
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/02-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "a"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#b"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#c"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#x"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#y"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#z"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#x"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "y"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "z"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/03-quads.json
new file mode 100644
index 00000000..a10bf885
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/pat/03-quads.json
@@ -0,0 +1,128 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": []
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#x"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#y"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#z"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "union",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#x1"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#y1"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#z1"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#x2"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#y2"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#z2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/reduced/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/reduced/01-quads.json
new file mode 100644
index 00000000..4096c168
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/reduced/01-quads.json
@@ -0,0 +1,45 @@
+{
+  "type": "reduced",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "y"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "z"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "x"
+      },
+      {
+        "termType": "Variable",
+        "value": "y"
+      },
+      {
+        "termType": "Variable",
+        "value": "z"
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/01-quads.json
new file mode 100644
index 00000000..b1118f7d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/01-quads.json
@@ -0,0 +1,17 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": []
+      },
+      {
+        "type": "bgp",
+        "patterns": []
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/02-quads.json
new file mode 100644
index 00000000..30591a3f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/02-quads.json
@@ -0,0 +1,38 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": []
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/13-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/13-quads.json
new file mode 100644
index 00000000..1f67975b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/dawg-syntax/struct/13-quads.json
@@ -0,0 +1,119 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "join",
+        "input": [
+          {
+            "type": "leftjoin",
+            "input": [
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#p"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#q"
+                    },
+                    "object": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#r"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#a"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#b"
+                    },
+                    "object": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#c"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#p"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#q"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#r"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/agg-empty-group-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/agg-empty-group-quads.json
new file mode 100644
index 00000000..7e2ac101
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/agg-empty-group-quads.json
@@ -0,0 +1,82 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "value"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "x"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "max",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "value"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "max"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "max"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/avg-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/avg-quads.json
new file mode 100644
index 00000000..89580e08
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/avg-quads.json
@@ -0,0 +1,73 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/dec"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variables": [],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "avg",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "avg"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "avg"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/avg-with-group-by-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/avg-with-group-by-quads.json
new file mode 100644
index 00000000..1e86b2bc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/avg-with-group-by-quads.json
@@ -0,0 +1,112 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "s"
+          }
+        ],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "avg",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "o"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "<=",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "2.0",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#decimal"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "avg"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "avg"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/count-3-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/count-3-quads.json
new file mode 100644
index 00000000..fbd72b53
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/count-3-quads.json
@@ -0,0 +1,112 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "S"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "P"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "O"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "P"
+          }
+        ],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "count",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "O"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": ">",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "2",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "C"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "P"
+    },
+    {
+      "termType": "Variable",
+      "value": "C"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/count-8b-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/count-8b-quads.json
new file mode 100644
index 00000000..835371bb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/count-8b-quads.json
@@ -0,0 +1,145 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "extend",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "S"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "O1"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              },
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "S"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/q"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "O2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variable": {
+            "termType": "Variable",
+            "value": "O12"
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "+",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "O1"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "O2"
+                }
+              }
+            ]
+          }
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "O12"
+          }
+        ],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "count",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "O1"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "C"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "var0"
+        }
+      }
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "O12"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "O12"
+    },
+    {
+      "termType": "Variable",
+      "value": "C"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/error-in-avg-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/error-in-avg-quads.json
new file mode 100644
index 00000000..5976243a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/error-in-avg-quads.json
@@ -0,0 +1,171 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "g"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.com/data/#p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "g"
+          }
+        ],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "avg",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "p"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "min",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "p"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var1"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "max",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "p"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var2"
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "avg"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "var0"
+        }
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "c"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "/",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "+",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "var1"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "var2"
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "g"
+    },
+    {
+      "termType": "Variable",
+      "value": "avg"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-1-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-1-quads.json
new file mode 100644
index 00000000..60747933
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-1-quads.json
@@ -0,0 +1,141 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "project",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "group",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "g_0"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [],
+          "aggregates": [
+            {
+              "type": "expression",
+              "subType": "aggregate",
+              "aggregator": "group_concat",
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              "separator": " ",
+              "distinct": false,
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "g"
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "||",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1 22",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "22 1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-2-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-2-quads.json
new file mode 100644
index 00000000..50396824
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-2-quads.json
@@ -0,0 +1,458 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "project",
+          "input": {
+            "type": "extend",
+            "input": {
+              "type": "group",
+              "input": {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "g_0"
+                    },
+                    "predicate": {
+                      "termType": "Variable",
+                      "value": "p"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "o"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              "variables": [
+                {
+                  "termType": "Variable",
+                  "value": "p"
+                }
+              ],
+              "aggregates": [
+                {
+                  "type": "expression",
+                  "subType": "aggregate",
+                  "aggregator": "group_concat",
+                  "expression": {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Variable",
+                      "value": "o"
+                    }
+                  },
+                  "separator": " ",
+                  "distinct": false,
+                  "variable": {
+                    "termType": "Variable",
+                    "value": "var0"
+                  }
+                }
+              ]
+            },
+            "variable": {
+              "termType": "Variable",
+              "value": "g"
+            },
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          },
+          "variables": [
+            {
+              "termType": "Variable",
+              "value": "p"
+            },
+            {
+              "termType": "Variable",
+              "value": "g"
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "||",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "&&",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "p"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://www.example.org/p1"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "||",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "operator",
+                      "operator": "=",
+                      "args": [
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Variable",
+                            "value": "g"
+                          }
+                        },
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Literal",
+                            "value": "1 22",
+                            "datatype": {
+                              "termType": "NamedNode",
+                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                            }
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "operator",
+                      "operator": "=",
+                      "args": [
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Variable",
+                            "value": "g"
+                          }
+                        },
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Literal",
+                            "value": "22 1",
+                            "datatype": {
+                              "termType": "NamedNode",
+                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "&&",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "p"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://www.example.org/p2"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "||",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "operator",
+                      "operator": "||",
+                      "args": [
+                        {
+                          "type": "expression",
+                          "subType": "operator",
+                          "operator": "||",
+                          "args": [
+                            {
+                              "type": "expression",
+                              "subType": "operator",
+                              "operator": "||",
+                              "args": [
+                                {
+                                  "type": "expression",
+                                  "subType": "operator",
+                                  "operator": "||",
+                                  "args": [
+                                    {
+                                      "type": "expression",
+                                      "subType": "operator",
+                                      "operator": "=",
+                                      "args": [
+                                        {
+                                          "type": "expression",
+                                          "subType": "term",
+                                          "term": {
+                                            "termType": "Variable",
+                                            "value": "g"
+                                          }
+                                        },
+                                        {
+                                          "type": "expression",
+                                          "subType": "term",
+                                          "term": {
+                                            "termType": "Literal",
+                                            "value": "aaa bb c",
+                                            "datatype": {
+                                              "termType": "NamedNode",
+                                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    {
+                                      "type": "expression",
+                                      "subType": "operator",
+                                      "operator": "=",
+                                      "args": [
+                                        {
+                                          "type": "expression",
+                                          "subType": "term",
+                                          "term": {
+                                            "termType": "Variable",
+                                            "value": "g"
+                                          }
+                                        },
+                                        {
+                                          "type": "expression",
+                                          "subType": "term",
+                                          "term": {
+                                            "termType": "Literal",
+                                            "value": "aaa c bb",
+                                            "datatype": {
+                                              "termType": "NamedNode",
+                                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  ]
+                                },
+                                {
+                                  "type": "expression",
+                                  "subType": "operator",
+                                  "operator": "=",
+                                  "args": [
+                                    {
+                                      "type": "expression",
+                                      "subType": "term",
+                                      "term": {
+                                        "termType": "Variable",
+                                        "value": "g"
+                                      }
+                                    },
+                                    {
+                                      "type": "expression",
+                                      "subType": "term",
+                                      "term": {
+                                        "termType": "Literal",
+                                        "value": "bb aaa c",
+                                        "datatype": {
+                                          "termType": "NamedNode",
+                                          "value": "http://www.w3.org/2001/XMLSchema#string"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              ]
+                            },
+                            {
+                              "type": "expression",
+                              "subType": "operator",
+                              "operator": "=",
+                              "args": [
+                                {
+                                  "type": "expression",
+                                  "subType": "term",
+                                  "term": {
+                                    "termType": "Variable",
+                                    "value": "g"
+                                  }
+                                },
+                                {
+                                  "type": "expression",
+                                  "subType": "term",
+                                  "term": {
+                                    "termType": "Literal",
+                                    "value": "bb c aaa",
+                                    "datatype": {
+                                      "termType": "NamedNode",
+                                      "value": "http://www.w3.org/2001/XMLSchema#string"
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          ]
+                        },
+                        {
+                          "type": "expression",
+                          "subType": "operator",
+                          "operator": "=",
+                          "args": [
+                            {
+                              "type": "expression",
+                              "subType": "term",
+                              "term": {
+                                "termType": "Variable",
+                                "value": "g"
+                              }
+                            },
+                            {
+                              "type": "expression",
+                              "subType": "term",
+                              "term": {
+                                "termType": "Literal",
+                                "value": "c aaa bb",
+                                "datatype": {
+                                  "termType": "NamedNode",
+                                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "operator",
+                      "operator": "=",
+                      "args": [
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Variable",
+                            "value": "g"
+                          }
+                        },
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Literal",
+                            "value": "c bb aaa",
+                            "datatype": {
+                              "termType": "NamedNode",
+                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      },
+      "variables": [],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "count",
+          "expression": {
+            "type": "expression",
+            "subType": "wildcard",
+            "wildcard": {
+              "type": "wildcard"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var1"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "c"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var1"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "c"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-with-separator-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-with-separator-quads.json
new file mode 100644
index 00000000..46e130ca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/group-concat-with-separator-quads.json
@@ -0,0 +1,141 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "project",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "group",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "g_0"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [],
+          "aggregates": [
+            {
+              "type": "expression",
+              "subType": "aggregate",
+              "aggregator": "group_concat",
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              "separator": ":",
+              "distinct": false,
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "g"
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "||",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1:22",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "22:1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/protect-from-error-in-avg-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/protect-from-error-in-avg-quads.json
new file mode 100644
index 00000000..c41b028d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/protect-from-error-in-avg-quads.json
@@ -0,0 +1,141 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "g"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/data/#p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "g"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "avg",
+          "expression": {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "if",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "operator",
+                "operator": "isnumeric",
+                "args": [
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Variable",
+                      "value": "p"
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "p"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "operator",
+                "operator": "coalesce",
+                "args": [
+                  {
+                    "type": "expression",
+                    "subType": "named",
+                    "name": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#double"
+                    },
+                    "args": [
+                      {
+                        "type": "expression",
+                        "subType": "term",
+                        "term": {
+                          "termType": "Variable",
+                          "value": "p"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Literal",
+                      "value": "0",
+                      "datatype": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/2001/XMLSchema#integer"
+                      }
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "avg"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "g"
+    },
+    {
+      "termType": "Variable",
+      "value": "avg"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/sample-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/sample-quads.json
new file mode 100644
index 00000000..9cff0f3c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/aggregates/sample-quads.json
@@ -0,0 +1,174 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "project",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "group",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/dec"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [],
+          "aggregates": [
+            {
+              "type": "expression",
+              "subType": "aggregate",
+              "aggregator": "sample",
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              "distinct": false,
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "sample"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "sample"
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "||",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "||",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "=",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "sample"
+                  }
+                },
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Literal",
+                    "value": "1.0",
+                    "datatype": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#decimal"
+                    }
+                  }
+                }
+              ]
+            },
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "=",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "sample"
+                  }
+                },
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Literal",
+                    "value": "2.2",
+                    "datatype": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#decimal"
+                    }
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "sample"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "3.5",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#decimal"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/group-concat-1-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/group-concat-1-quads.json
new file mode 100644
index 00000000..60747933
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/group-concat-1-quads.json
@@ -0,0 +1,141 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "project",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "group",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "g_0"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [],
+          "aggregates": [
+            {
+              "type": "expression",
+              "subType": "aggregate",
+              "aggregator": "group_concat",
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              "separator": " ",
+              "distinct": false,
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "g"
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "||",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1 22",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "22 1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/in-1-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/in-1-quads.json
new file mode 100644
index 00000000..610efe2a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/in-1-quads.json
@@ -0,0 +1,65 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": []
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "in",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "3",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/not-in-1-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/not-in-1-quads.json
new file mode 100644
index 00000000..8fa3a32b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/not-in-1-quads.json
@@ -0,0 +1,29 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": []
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "notin",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.json
new file mode 100644
index 00000000..865fa029
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.json
@@ -0,0 +1,28 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#Person"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.json
new file mode 100644
index 00000000..2226d0d7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.json
@@ -0,0 +1,88 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "e_aa"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_aa"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#r"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "e_dd"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_dd"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#t"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "e_bb"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_bb"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#s"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#a"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/syn-pname-01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/syn-pname-01-quads.json
new file mode 100644
index 00000000..cba62ea6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/ask/syn-pname-01-quads.json
@@ -0,0 +1,7 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/01-quads.json
new file mode 100644
index 00000000..0b544ca2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/01-quads.json
@@ -0,0 +1,68 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "z"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "+",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "10",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/02-quads.json
new file mode 100644
index 00000000..46a73ebf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/02-quads.json
@@ -0,0 +1,110 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "z"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "+",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "10",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "z2"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "+",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "100",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    },
+    {
+      "termType": "Variable",
+      "value": "z2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/03-quads.json
new file mode 100644
index 00000000..fc7d5061
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/03-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "extend",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "+",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "o"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        }
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s1"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p1"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "z"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "z"
+    },
+    {
+      "termType": "Variable",
+      "value": "s1"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/04-quads.json
new file mode 100644
index 00000000..9c3ce9f0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/04-quads.json
@@ -0,0 +1,61 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "z"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "nova"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/05-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/05-quads.json
new file mode 100644
index 00000000..5d0d50ec
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/05-quads.json
@@ -0,0 +1,110 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "z"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "+",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "1",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "z"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "3",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/07-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/07-quads.json
new file mode 100644
index 00000000..130d3532
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/07-quads.json
@@ -0,0 +1,132 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "union",
+        "input": [
+          {
+            "type": "extend",
+            "input": {
+              "type": "bgp",
+              "patterns": []
+            },
+            "variable": {
+              "termType": "Variable",
+              "value": "z"
+            },
+            "expression": {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "+",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "o"
+                  }
+                },
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Literal",
+                    "value": "1",
+                    "datatype": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#integer"
+                    }
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "type": "extend",
+            "input": {
+              "type": "bgp",
+              "patterns": []
+            },
+            "variable": {
+              "termType": "Variable",
+              "value": "z"
+            },
+            "expression": {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "+",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "o"
+                  }
+                },
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Literal",
+                    "value": "2",
+                    "datatype": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#integer"
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/08-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/08-quads.json
new file mode 100644
index 00000000..5d0d50ec
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/08-quads.json
@@ -0,0 +1,110 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "z"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "+",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "1",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "z"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "3",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/10-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/10-quads.json
new file mode 100644
index 00000000..8435a129
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/10-quads.json
@@ -0,0 +1,96 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "extend",
+        "input": {
+          "type": "bgp",
+          "patterns": []
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "4",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      },
+      {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.org/p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "v"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "v"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "z"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "v"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/11-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/11-quads.json
new file mode 100644
index 00000000..98d3b627
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/bind/11-quads.json
@@ -0,0 +1,96 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "join",
+      "input": [
+        {
+          "type": "extend",
+          "input": {
+            "type": "bgp",
+            "patterns": []
+          },
+          "variable": {
+            "termType": "Variable",
+            "value": "z"
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "4",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        },
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.org/p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "v"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "v"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "z"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "v"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/construct-from-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/construct-from-quads.json
new file mode 100644
index 00000000..dd3dfe7c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/construct-from-quads.json
@@ -0,0 +1,65 @@
+{
+  "type": "from",
+  "input": {
+    "type": "slice",
+    "input": {
+      "type": "construct",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "template": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "start": 0,
+    "length": 100
+  },
+  "default": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.com/data"
+    }
+  ],
+  "named": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/construct-slice-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/construct-slice-quads.json
new file mode 100644
index 00000000..9bded160
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/construct-slice-quads.json
@@ -0,0 +1,55 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "construct",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "template": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "start": 0,
+  "length": 100
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere01-quads.json
new file mode 100644
index 00000000..c55afa28
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere01-quads.json
@@ -0,0 +1,50 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere02-quads.json
new file mode 100644
index 00000000..0bc95dd6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere02-quads.json
@@ -0,0 +1,90 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/s1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.org/s1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere03-quads.json
new file mode 100644
index 00000000..707122ca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere03-quads.json
@@ -0,0 +1,90 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/s2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/s2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.org/s2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o1"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.org/s2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere05-modified-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere05-modified-quads.json
new file mode 100644
index 00000000..a03e854d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere05-modified-quads.json
@@ -0,0 +1,76 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "NamedNode",
+            "value": "http://example.org/o1"
+          }
+        }
+      ]
+    }
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere06-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere06-quads.json
new file mode 100644
index 00000000..154da845
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/construct/constructwhere06-quads.json
@@ -0,0 +1,50 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "e_s_b"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "e_o_b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_s_b"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "BlankNode",
+        "value": "e_o_b"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.json
new file mode 100644
index 00000000..c81d2577
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.json
@@ -0,0 +1,104 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": false,
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "existence",
+          "not": true,
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/exists/nested-positive-exists-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/exists/nested-positive-exists-quads.json
new file mode 100644
index 00000000..6be0fbc6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/exists/nested-positive-exists-quads.json
@@ -0,0 +1,104 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": false,
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "existence",
+          "not": false,
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/bnode-str-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/bnode-str-quads.json
new file mode 100644
index 00000000..86a76b90
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/bnode-str-quads.json
@@ -0,0 +1,226 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "a"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.org/str"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "s1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "b"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.org/str"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "s2"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "&&",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "||",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "a"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://example.org/s1"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "a"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://example.org/s3"
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "||",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "b"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://example.org/s1"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "b"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://example.org/s3"
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "b1"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "bnode",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "s1"
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "b2"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "bnode",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "s2"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s1"
+    },
+    {
+      "termType": "Variable",
+      "value": "s2"
+    },
+    {
+      "termType": "Variable",
+      "value": "b1"
+    },
+    {
+      "termType": "Variable",
+      "value": "b2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/now-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/now-quads.json
new file mode 100644
index 00000000..75aa2b1c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/now-quads.json
@@ -0,0 +1,53 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": []
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "n"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "now",
+        "args": []
+      }
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "datatype",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "n"
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/strlang-str-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/strlang-str-quads.json
new file mode 100644
index 00000000..7e3c87ca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/functions/strlang-str-quads.json
@@ -0,0 +1,116 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/str"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "str"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "langmatches",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "lang",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "str"
+                }
+              }
+            ]
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "en",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#string"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "s2"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "strlang",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "str",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "str"
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "en-US",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "s2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/01-quads.json
new file mode 100644
index 00000000..7db4ae79
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/01-quads.json
@@ -0,0 +1,44 @@
+{
+  "type": "project",
+  "input": {
+    "type": "group",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example/p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "v"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ],
+    "aggregates": []
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/03-quads.json
new file mode 100644
index 00000000..acf7d314
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/03-quads.json
@@ -0,0 +1,112 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example/p"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "v"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example/q"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "w"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "w"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "sample",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "v"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "S"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "w"
+    },
+    {
+      "termType": "Variable",
+      "value": "S"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/04-quads.json
new file mode 100644
index 00000000..c68d680a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/group/04-quads.json
@@ -0,0 +1,146 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "leftjoin",
+          "input": [
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/p"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "v"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            },
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/q"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "w"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "X"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "coalesce",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "w"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1605-11-05",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#date"
+                }
+              }
+            }
+          ]
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "X"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "sample",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "v"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "S"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "X"
+    },
+    {
+      "termType": "Variable",
+      "value": "S"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.json
new file mode 100644
index 00000000..07a62d5d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.json
@@ -0,0 +1,307 @@
+{
+  "type": "distinct",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "minus",
+        "input": [
+          {
+            "type": "minus",
+            "input": [
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s2"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                    },
+                    "object": {
+                      "termType": "NamedNode",
+                      "value": "http://example/Set"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  },
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s1"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                    },
+                    "object": {
+                      "termType": "NamedNode",
+                      "value": "http://example/Set"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "filter",
+                "input": {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "s1"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Set"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    },
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "s2"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Set"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    },
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "s1"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://example/member"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "x"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                "expression": {
+                  "type": "expression",
+                  "subType": "existence",
+                  "not": true,
+                  "input": {
+                    "type": "bgp",
+                    "patterns": [
+                      {
+                        "type": "pattern",
+                        "termType": "Quad",
+                        "subject": {
+                          "termType": "Variable",
+                          "value": "s2"
+                        },
+                        "predicate": {
+                          "termType": "NamedNode",
+                          "value": "http://example/member"
+                        },
+                        "object": {
+                          "termType": "Variable",
+                          "value": "x"
+                        },
+                        "graph": {
+                          "termType": "DefaultGraph",
+                          "value": ""
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "type": "filter",
+            "input": {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s1"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                  },
+                  "object": {
+                    "termType": "NamedNode",
+                    "value": "http://example/Set"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                },
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s2"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                  },
+                  "object": {
+                    "termType": "NamedNode",
+                    "value": "http://example/Set"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                },
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s2"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/member"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "x"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            },
+            "expression": {
+              "type": "expression",
+              "subType": "existence",
+              "not": true,
+              "input": {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s1"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://example/member"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "x"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "<",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "str",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "s1"
+                }
+              }
+            ]
+          },
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "str",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "s2"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "s1"
+      },
+      {
+        "termType": "Variable",
+        "value": "s2"
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.json
new file mode 100644
index 00000000..b4c4f20a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.json
@@ -0,0 +1,191 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "exam"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#PhysicalExamination"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "exam"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/date"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "date"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "exam"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#precedes"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#operation1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "op"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#SurgicalProcedure"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "op"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/date"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "opDT"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": true,
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "otherExam"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#PhysicalExamination"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "otherExam"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#follows"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "exam"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "otherExam"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#precedes"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#operation1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "exam"
+    },
+    {
+      "termType": "Variable",
+      "value": "date"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/simple-minus-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/simple-minus-quads.json
new file mode 100644
index 00000000..7c7c7be9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/simple-minus-quads.json
@@ -0,0 +1,68 @@
+{
+  "type": "project",
+  "input": {
+    "type": "minus",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "uri"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2004/02/skos/core#prefLabel"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "prefLabel"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "uri"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2004/02/skos/core#broader"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "https://test.com/"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "prefLabel"
+    },
+    {
+      "termType": "Variable",
+      "value": "uri"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.json
new file mode 100644
index 00000000..c121e4c1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.json
@@ -0,0 +1,165 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "minus",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "a"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example/p1"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "b"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "a"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example/p2"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "c"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "leftjoin",
+          "input": [
+            {
+              "type": "leftjoin",
+              "input": [
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "d"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Sub"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "d"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://example/q1"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "b"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "d"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/q2"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "c"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "a"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.json
new file mode 100644
index 00000000..dfdec0c3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.json
@@ -0,0 +1,205 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "minus",
+      "input": [
+        {
+          "type": "leftjoin",
+          "input": [
+            {
+              "type": "leftjoin",
+              "input": [
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "a"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Min"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "a"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://example/p1"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "b"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "a"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/p2"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "c"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "type": "leftjoin",
+          "input": [
+            {
+              "type": "leftjoin",
+              "input": [
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "d"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Sub"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "d"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://example/q1"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "b"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "d"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/q2"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "c"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "a"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/01-simple-path-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/01-simple-path-quads.json
new file mode 100644
index 00000000..11cc1f67
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/01-simple-path-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/instance#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p2"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p3"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/02-star-path-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/02-star-path-quads.json
new file mode 100644
index 00000000..44377d96
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/02-star-path-quads.json
@@ -0,0 +1,53 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/instance#a"
+    },
+    "predicate": {
+      "type": "ZeroOrMorePath",
+      "path": {
+        "type": "seq",
+        "input": [
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p1"
+            }
+          },
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p2"
+            }
+          },
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p3"
+            }
+          }
+        ]
+      }
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "x"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/08-reverse-path-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/08-reverse-path-quads.json
new file mode 100644
index 00000000..83437c53
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/08-reverse-path-quads.json
@@ -0,0 +1,28 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/instance#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/instance#b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/09-reverse-sequence-path-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/09-reverse-sequence-path-quads.json
new file mode 100644
index 00000000..f1eb8a73
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/09-reverse-sequence-path-quads.json
@@ -0,0 +1,54 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p2"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/instance#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/10-path-with-negation-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/10-path-with-negation-quads.json
new file mode 100644
index 00000000..451a2339
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/10-path-with-negation-quads.json
@@ -0,0 +1,37 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/instance#a"
+    },
+    "predicate": {
+      "type": "nps",
+      "iris": [
+        {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p1"
+        },
+        {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p2"
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "x"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.json
new file mode 100644
index 00000000..82aa2465
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.json
@@ -0,0 +1,46 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/instance#a"
+    },
+    "predicate": {
+      "type": "OneOrMorePath",
+      "path": {
+        "type": "seq",
+        "input": [
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p1"
+            }
+          },
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p2"
+            }
+          }
+        ]
+      }
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "x"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/14-star-path-over-foaf-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/14-star-path-over-foaf-quads.json
new file mode 100644
index 00000000..04526770
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/14-star-path-over-foaf-quads.json
@@ -0,0 +1,59 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "path",
+      "subject": {
+        "termType": "Variable",
+        "value": "X"
+      },
+      "predicate": {
+        "type": "ZeroOrMorePath",
+        "path": {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/knows"
+          }
+        }
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "X"
+        }
+      },
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "Y"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "X"
+    },
+    {
+      "termType": "Variable",
+      "value": "Y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/14-star-path-over-foafknows-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/14-star-path-over-foafknows-quads.json
new file mode 100644
index 00000000..04526770
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/14-star-path-over-foafknows-quads.json
@@ -0,0 +1,59 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "path",
+      "subject": {
+        "termType": "Variable",
+        "value": "X"
+      },
+      "predicate": {
+        "type": "ZeroOrMorePath",
+        "path": {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/knows"
+          }
+        }
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "X"
+        }
+      },
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "Y"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "X"
+    },
+    {
+      "termType": "Variable",
+      "value": "Y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/28a-diamond-with-loop-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/28a-diamond-with-loop-quads.json
new file mode 100644
index 00000000..62938da0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/28a-diamond-with-loop-quads.json
@@ -0,0 +1,46 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://example/a"
+    },
+    "predicate": {
+      "type": "ZeroOrOnePath",
+      "path": {
+        "type": "seq",
+        "input": [
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://example/p"
+            }
+          },
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://example/p"
+            }
+          }
+        ]
+      }
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "t"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/30-operator-precedence-1-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/30-operator-precedence-1-quads.json
new file mode 100644
index 00000000..e1ea7b85
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/30-operator-precedence-1-quads.json
@@ -0,0 +1,62 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/a"
+    },
+    "predicate": {
+      "type": "alt",
+      "input": [
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p1"
+          }
+        },
+        {
+          "type": "seq",
+          "input": [
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p2"
+              }
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p3"
+              }
+            }
+          ]
+        },
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p4"
+          }
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "t"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/31-operator-precedence-2-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/31-operator-precedence-2-quads.json
new file mode 100644
index 00000000..d03e78f7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/31-operator-precedence-2-quads.json
@@ -0,0 +1,82 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "path",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/a"
+        },
+        "predicate": {
+          "type": "alt",
+          "input": [
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p1"
+              }
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p2"
+              }
+            }
+          ]
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "path",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "type": "alt",
+          "input": [
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p3"
+              }
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p4"
+              }
+            }
+          ]
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "t"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/32-operator-precedence-3-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/32-operator-precedence-3-quads.json
new file mode 100644
index 00000000..7b22d376
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/32-operator-precedence-3-quads.json
@@ -0,0 +1,65 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/a"
+    },
+    "predicate": {
+      "type": "alt",
+      "input": [
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p0"
+          }
+        },
+        {
+          "type": "seq",
+          "input": [
+            {
+              "type": "inv",
+              "path": {
+                "type": "link",
+                "iri": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p1"
+                }
+              }
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p2"
+              }
+            }
+          ]
+        },
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p3"
+          }
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "t"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/33-operator-precedence-4-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/33-operator-precedence-4-quads.json
new file mode 100644
index 00000000..75418d8c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/33-operator-precedence-4-quads.json
@@ -0,0 +1,70 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/a"
+    },
+    "predicate": {
+      "type": "alt",
+      "input": [
+        {
+          "type": "seq",
+          "input": [
+            {
+              "type": "alt",
+              "input": [
+                {
+                  "type": "link",
+                  "iri": {
+                    "termType": "NamedNode",
+                    "value": "http://www.example.org/p0"
+                  }
+                },
+                {
+                  "type": "inv",
+                  "path": {
+                    "type": "link",
+                    "iri": {
+                      "termType": "NamedNode",
+                      "value": "http://www.example.org/p1"
+                    }
+                  }
+                }
+              ]
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p2"
+              }
+            }
+          ]
+        },
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p3"
+          }
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "t"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/37-nested-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/37-nested-quads.json
new file mode 100644
index 00000000..3b9c839f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/37-nested-quads.json
@@ -0,0 +1,50 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "path",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.org/A0"
+      },
+      "predicate": {
+        "type": "ZeroOrMorePath",
+        "path": {
+          "type": "ZeroOrMorePath",
+          "path": {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://example.org/P"
+            }
+          }
+        }
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "X"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "X"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "X"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/path-union-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/path-union-quads.json
new file mode 100644
index 00000000..a94af203
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/paths/path-union-quads.json
@@ -0,0 +1,98 @@
+{
+  "type": "project",
+  "input": {
+    "type": "union",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "item"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.wikidata.org/prop/direct/P31"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.wikidata.org/entity/Q486972"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "join",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "item"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.wikidata.org/prop/direct/P31"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "instanceOf"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "path",
+            "subject": {
+              "termType": "Variable",
+              "value": "instanceOf"
+            },
+            "predicate": {
+              "type": "OneOrMorePath",
+              "path": {
+                "type": "link",
+                "iri": {
+                  "termType": "NamedNode",
+                  "value": "http://www.wikidata.org/prop/direct/P279"
+                }
+              }
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.wikidata.org/entity/Q486972"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "instanceOf"
+    },
+    {
+      "termType": "Variable",
+      "value": "item"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service01-quads.json
new file mode 100644
index 00000000..30d0f9ac
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service01-quads.json
@@ -0,0 +1,80 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p1"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p2"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o2"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example.org/sparql"
+        },
+        "silent": false
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service02-quads.json
new file mode 100644
index 00000000..37509a0b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service02-quads.json
@@ -0,0 +1,88 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example1.org/sparql"
+        },
+        "silent": false
+      },
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p2"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o2"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example2.org/sparql"
+        },
+        "silent": false
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service03-quads.json
new file mode 100644
index 00000000..463994c5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service03-quads.json
@@ -0,0 +1,88 @@
+{
+  "type": "project",
+  "input": {
+    "type": "service",
+    "input": {
+      "type": "leftjoin",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "service",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p2"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "name": {
+            "termType": "NamedNode",
+            "value": "http://example2.org/sparql"
+          },
+          "silent": false
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example1.org/sparql"
+    },
+    "silent": false
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service04-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service04-quads.json
new file mode 100644
index 00000000..a6804739
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service04-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o1"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "service",
+            "input": {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://xmlns.com/foaf/0.1/knows"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "o2"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            },
+            "name": {
+              "termType": "NamedNode",
+              "value": "http://example.org/sparql"
+            },
+            "silent": false
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "o2"
+          }
+        ],
+        "bindings": [
+          {
+            "o2": {
+              "termType": "NamedNode",
+              "value": "http://example.org/b"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service05-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service05-quads.json
new file mode 100644
index 00000000..86ba7859
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service05-quads.json
@@ -0,0 +1,126 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://purl.org/dc/elements/1.1/subject"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "projectSubject"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://rdfs.org/ns/void#sparqlEndpoint"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "service"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "regex",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "projectSubject"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "remote",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        }
+      },
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "project"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://usefulinc.com/ns/doap#name"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "title"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "Variable",
+          "value": "service"
+        },
+        "silent": false
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "service"
+    },
+    {
+      "termType": "Variable",
+      "value": "title"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service06-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service06-quads.json
new file mode 100644
index 00000000..52c7932b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service06-quads.json
@@ -0,0 +1,88 @@
+{
+  "type": "project",
+  "input": {
+    "type": "service",
+    "input": {
+      "type": "leftjoin",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "service",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p2"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "name": {
+            "termType": "NamedNode",
+            "value": "http://invalid.endpoint.org/sparql"
+          },
+          "silent": true
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example1.org/sparql"
+    },
+    "silent": false
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service07-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service07-quads.json
new file mode 100644
index 00000000..e2e30718
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/service/service07-quads.json
@@ -0,0 +1,80 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p2"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o2"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://invalid.endpoint.org/sparql"
+        },
+        "silent": true
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/06-subquery-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/06-subquery-quads.json
new file mode 100644
index 00000000..50b54865
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/06-subquery-quads.json
@@ -0,0 +1,51 @@
+{
+  "type": "project",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "y"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "x"
+      },
+      {
+        "termType": "Variable",
+        "value": "y"
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.json
new file mode 100644
index 00000000..d7dcad97
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.json
@@ -0,0 +1,116 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "project",
+        "input": {
+          "type": "extend",
+          "input": {
+            "type": "group",
+            "input": {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "x"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://www.example.org/schema#p"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "y"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            },
+            "variables": [],
+            "aggregates": [
+              {
+                "type": "expression",
+                "subType": "aggregate",
+                "aggregator": "max",
+                "expression": {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "y"
+                  }
+                },
+                "distinct": false,
+                "variable": {
+                  "termType": "Variable",
+                  "value": "var0"
+                }
+              }
+            ]
+          },
+          "variable": {
+            "termType": "Variable",
+            "value": "max"
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "max"
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "max"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "max"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/09-nested-subqueries-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/09-nested-subqueries-quads.json
new file mode 100644
index 00000000..e851a62d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/09-nested-subqueries-quads.json
@@ -0,0 +1,86 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "project",
+        "input": {
+          "type": "project",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "x"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/schema#q"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "t"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [
+            {
+              "termType": "Variable",
+              "value": "x"
+            }
+          ]
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "x"
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "y"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.json
new file mode 100644
index 00000000..f1d0f6a0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.json
@@ -0,0 +1,127 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "join",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "g_0"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2000/01/rdf-schema#label"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "L"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "O"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://www.example.orghasItem"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "g_0"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "slice",
+          "input": {
+            "type": "distinct",
+            "input": {
+              "type": "project",
+              "input": {
+                "type": "orderby",
+                "input": {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "O"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://www.example.orgOrder"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                "expressions": [
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Variable",
+                      "value": "O"
+                    }
+                  }
+                ]
+              },
+              "variables": [
+                {
+                  "termType": "Variable",
+                  "value": "O"
+                }
+              ]
+            }
+          },
+          "start": 0,
+          "length": 2
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "L"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "L"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/aggregate-15-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/aggregate-15-quads.json
new file mode 100644
index 00000000..75624028
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/aggregate-15-quads.json
@@ -0,0 +1,53 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "bgp",
+        "patterns": []
+      },
+      "variables": [],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "group_concat",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "x"
+            }
+          },
+          "separator": ";",
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "y"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/bindscope1-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/bindscope1-quads.json
new file mode 100644
index 00000000..fc48b935
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/bindscope1-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "extend",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "NamedNode",
+                "value": "http://www.example.orgs"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://www.example.orgp"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "o1"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "+",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "o"
+              }
+            }
+          ]
+        }
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://www.example.orgs"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.example.orgq"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-oneof-01-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-oneof-01-quads.json
new file mode 100644
index 00000000..ecdf2b37
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-oneof-01-quads.json
@@ -0,0 +1,111 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "notin",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "+",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "s"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "57",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-oneof-03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-oneof-03-quads.json
new file mode 100644
index 00000000..8d2b15ab
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-oneof-03-quads.json
@@ -0,0 +1,80 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "in",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "NamedNode",
+            "value": "x:x"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-subquery-02-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-subquery-02-quads.json
new file mode 100644
index 00000000..84c54ac1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/syntax/syntax-subquery-02-quads.json
@@ -0,0 +1,59 @@
+{
+  "type": "project",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/01-bind-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/01-bind-quads.json
new file mode 100644
index 00000000..696ed8e9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/01-bind-quads.json
@@ -0,0 +1,84 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "book"
+          }
+        ],
+        "bindings": [
+          {
+            "book": {
+              "termType": "NamedNode",
+              "value": "http://example.org/book/book1"
+            }
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://purl.org/dc/elements/1.1/title"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "title"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#price"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "price"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "book"
+    },
+    {
+      "termType": "Variable",
+      "value": "title"
+    },
+    {
+      "termType": "Variable",
+      "value": "price"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.json
new file mode 100644
index 00000000..b03aa727
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.json
@@ -0,0 +1,92 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p1"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p2"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o2"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "o1"
+          },
+          {
+            "termType": "Variable",
+            "value": "o2"
+          }
+        ],
+        "bindings": [
+          {
+            "o1": {
+              "termType": "Literal",
+              "value": "Alan",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#string"
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.json
new file mode 100644
index 00000000..e3db1304
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.json
@@ -0,0 +1,98 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p1"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p2"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o2"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "o1"
+          },
+          {
+            "termType": "Variable",
+            "value": "o2"
+          }
+        ],
+        "bindings": [
+          {
+            "o2": {
+              "termType": "Literal",
+              "value": "Alan",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#string"
+              }
+            }
+          },
+          {
+            "o1": {
+              "termType": "NamedNode",
+              "value": "http://example.org/b"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.json
new file mode 100644
index 00000000..43067ff4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.json
@@ -0,0 +1,94 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o1"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://xmlns.com/foaf/0.1/knows"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "o2"
+          }
+        ],
+        "bindings": [
+          {
+            "o2": {
+              "termType": "NamedNode",
+              "value": "http://example.org/b"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.json
new file mode 100644
index 00000000..c4202e0c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.json
@@ -0,0 +1,84 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://purl.org/dc/elements/1.1/title"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "title"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#price"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "price"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "book"
+          }
+        ],
+        "bindings": [
+          {
+            "book": {
+              "termType": "NamedNode",
+              "value": "http://example.org/book/book1"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "book"
+    },
+    {
+      "termType": "Variable",
+      "value": "title"
+    },
+    {
+      "termType": "Variable",
+      "value": "price"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-subquery-values-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-subquery-values-quads.json
new file mode 100644
index 00000000..34242ed2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/post-subquery-values-quads.json
@@ -0,0 +1,77 @@
+{
+  "type": "project",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "join",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "values",
+          "variables": [
+            {
+              "termType": "Variable",
+              "value": "o"
+            }
+          ],
+          "bindings": [
+            {
+              "o": {
+                "termType": "NamedNode",
+                "value": "http://example.org/b"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/values-many-once-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/values-many-once-quads.json
new file mode 100644
index 00000000..2455a10a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/values/values-many-once-quads.json
@@ -0,0 +1,38 @@
+{
+  "type": "project",
+  "input": {
+    "type": "values",
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "y"
+      },
+      {
+        "termType": "Variable",
+        "value": "z"
+      }
+    ],
+    "bindings": [
+      {
+        "y": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "z": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.1-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.1-quads.json
new file mode 100644
index 00000000..4d1a81aa
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.1-quads.json
@@ -0,0 +1,13 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "terms": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.2a-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.2a-quads.json
new file mode 100644
index 00000000..73a557d8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.2a-quads.json
@@ -0,0 +1,34 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/mbox"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "mailto:alice@org"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "terms": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.2c-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.2c-quads.json
new file mode 100644
index 00000000..5963b35f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/16.4.2c-quads.json
@@ -0,0 +1,42 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/knows"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "terms": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/star-empty-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/star-empty-quads.json
new file mode 100644
index 00000000..26ca801b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/star-empty-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "terms": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/star-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/star-quads.json
new file mode 100644
index 00000000..3c081186
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/describe/star-quads.json
@@ -0,0 +1,38 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "terms": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/empty-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/empty-quads.json
new file mode 100644
index 00000000..0bb9155f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/empty-quads.json
@@ -0,0 +1,3 @@
+{
+  "type": "nop"
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/existence-subquery-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/existence-subquery-quads.json
new file mode 100644
index 00000000..7a597c7c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/existence-subquery-quads.json
@@ -0,0 +1,148 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "https://mydom2#predB"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "b"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": false,
+      "input": {
+        "type": "join",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "var0"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "https://mydom2#predN"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "q"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "project",
+            "input": {
+              "type": "extend",
+              "input": {
+                "type": "extend",
+                "input": {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "_s"
+                      },
+                      "predicate": {
+                        "termType": "Variable",
+                        "value": "p"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "_o"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                "variable": {
+                  "termType": "Variable",
+                  "value": "q2"
+                },
+                "expression": {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "_s"
+                  }
+                }
+              },
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              },
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "_o"
+                }
+              }
+            },
+            "variables": [
+              {
+                "termType": "Variable",
+                "value": "q2"
+              },
+              {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/filter-union-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/filter-union-quads.json
new file mode 100644
index 00000000..f1e5d560
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/filter-union-quads.json
@@ -0,0 +1,63 @@
+{
+  "type": "project",
+  "input": {
+    "type": "union",
+    "input": [
+      {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": []
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "false",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#boolean"
+            }
+          }
+        }
+      },
+      {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": []
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "this"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "NamedNode",
+                "value": "http://example.org/InvalidResource"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "this"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.1-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.1-quads.json
new file mode 100644
index 00000000..b94a2fce
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.1-quads.json
@@ -0,0 +1,44 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/name"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "name"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "name"
+      }
+    ]
+  },
+  "default": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/aliceFoaf"
+    }
+  ],
+  "named": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.2-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.2-quads.json
new file mode 100644
index 00000000..943b2e7e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.2-quads.json
@@ -0,0 +1,48 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/name"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "name"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "name"
+      }
+    ]
+  },
+  "default": [],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/alice"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/bob"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.3-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.3-quads.json
new file mode 100644
index 00000000..6d107fed
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.2.3-quads.json
@@ -0,0 +1,81 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "g"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/publisher"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "who"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "mbox"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "g"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "who"
+      },
+      {
+        "termType": "Variable",
+        "value": "g"
+      },
+      {
+        "termType": "Variable",
+        "value": "mbox"
+      }
+    ]
+  },
+  "default": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/dft.ttl"
+    }
+  ],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/alice"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/bob"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.1-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.1-quads.json
new file mode 100644
index 00000000..1cbac971
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.1-quads.json
@@ -0,0 +1,72 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "mailto:bob@work.example"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "src"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/nick"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "bobNick"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "src"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "src"
+      },
+      {
+        "termType": "Variable",
+        "value": "bobNick"
+      }
+    ]
+  },
+  "default": [],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/aliceFoaf"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/bobFoaf"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.2-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.2-quads.json
new file mode 100644
index 00000000..8010b45e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.2-quads.json
@@ -0,0 +1,68 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "mailto:bob@work.example"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/bobFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/nick"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "nick"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/bobFoaf"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "nick"
+      }
+    ]
+  },
+  "default": [],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/aliceFoaf"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/bobFoaf"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.3-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.3-quads.json
new file mode 100644
index 00000000..2c88d1d1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.3-quads.json
@@ -0,0 +1,176 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "alice"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "mailto:alice@work.example"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "alice"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/knows"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "whom"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "whom"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "mbox"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "whom"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2000/01/rdf-schema#seeAlso"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "ppd"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "ppd"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/PersonalProfileDocument"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "w"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "mbox"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "ppd"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "w"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/nick"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "nick"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "ppd"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "mbox"
+      },
+      {
+        "termType": "Variable",
+        "value": "nick"
+      },
+      {
+        "termType": "Variable",
+        "value": "ppd"
+      }
+    ]
+  },
+  "default": [],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/aliceFoaf"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/bobFoaf"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.4-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.4-quads.json
new file mode 100644
index 00000000..0208594f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/from/13.3.4-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://purl.org/dc/elements/1.1/publisher"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "name"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://purl.org/dc/elements/1.1/date"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "date"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/name"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "name"
+        },
+        "graph": {
+          "termType": "Variable",
+          "value": "g"
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/mbox"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "mbox"
+        },
+        "graph": {
+          "termType": "Variable",
+          "value": "g"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "name"
+    },
+    {
+      "termType": "Variable",
+      "value": "mbox"
+    },
+    {
+      "termType": "Variable",
+      "value": "date"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/group-by-no-var-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/group-by-no-var-quads.json
new file mode 100644
index 00000000..9970c161
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/group-by-no-var-quads.json
@@ -0,0 +1,100 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "x"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "y"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "z"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "var1"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "str",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "x"
+              }
+            }
+          ]
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "var1"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "max",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "y"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "yy"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "yy"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/negate-and-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/negate-and-quads.json
new file mode 100644
index 00000000..28c57bf3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/negate-and-quads.json
@@ -0,0 +1,117 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "c"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2002/07/owl#Class"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "!",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "&&",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "operator",
+                "operator": "bound",
+                "args": [
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Variable",
+                      "value": "c"
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "expression",
+                "subType": "operator",
+                "operator": "regex",
+                "args": [
+                  {
+                    "type": "expression",
+                    "subType": "operator",
+                    "operator": "str",
+                    "args": [
+                      {
+                        "type": "expression",
+                        "subType": "term",
+                        "term": {
+                          "termType": "Variable",
+                          "value": "c"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Literal",
+                      "value": "^toto",
+                      "datatype": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/2001/XMLSchema#string"
+                      }
+                    }
+                  },
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Literal",
+                      "value": "i",
+                      "datatype": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/2001/XMLSchema#string"
+                      }
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "c"
+      }
+    ]
+  },
+  "start": 0,
+  "length": 10
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/negated-path-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/negated-path-quads.json
new file mode 100644
index 00000000..7e1f68fb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/negated-path-quads.json
@@ -0,0 +1,38 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "path",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://dbpedia.org/resource/12_Monkeys"
+      },
+      "predicate": {
+        "type": "nps",
+        "iris": [
+          {
+            "termType": "NamedNode",
+            "value": "http://dbpedia.org/ontology/starring"
+          }
+        ]
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      }
+    ]
+  },
+  "start": 0,
+  "length": 100
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/nested-union-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/nested-union-quads.json
new file mode 100644
index 00000000..9bfbb998
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/nested-union-quads.json
@@ -0,0 +1,196 @@
+{
+  "type": "project",
+  "input": {
+    "type": "union",
+    "input": [
+      {
+        "type": "join",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://xlabelA"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "pLabel"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "union",
+            "input": [
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://xlabelC"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "Label"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://xlabelD"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "label"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "join",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://xlabelB"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "pLabel"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "union",
+            "input": [
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://xlabelC"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "Label"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://xlabelD"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "label"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "label"
+    },
+    {
+      "termType": "Variable",
+      "value": "Label"
+    },
+    {
+      "termType": "Variable",
+      "value": "pLabel"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/path-inverse-negation-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/path-inverse-negation-quads.json
new file mode 100644
index 00000000..50ec3bdc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/path-inverse-negation-quads.json
@@ -0,0 +1,50 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/instance#a"
+    },
+    "predicate": {
+      "type": "alt",
+      "input": [
+        {
+          "type": "nps",
+          "iris": [
+            {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p1"
+            }
+          ]
+        },
+        {
+          "type": "inv",
+          "path": {
+            "type": "nps",
+            "iris": [
+              {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/schema#p2"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "x"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/project-filter-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/project-filter-quads.json
new file mode 100644
index 00000000..046560a4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/project-filter-quads.json
@@ -0,0 +1,97 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "n"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": true,
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "x"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.com/q"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "m"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "n"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "m"
+              }
+            }
+          ]
+        }
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "n"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/unused-extend-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/unused-extend-quads.json
new file mode 100644
index 00000000..18831483
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/unused-extend-quads.json
@@ -0,0 +1,99 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://mydom#startTime"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "st"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://mydom#endTime"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "et"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "duration"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "-",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "et"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "st"
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "d"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "duration"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "d"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/clear-drop-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/clear-drop-quads.json
new file mode 100644
index 00000000..0e95dea8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/clear-drop-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "compositeupdate",
+  "updates": [
+    {
+      "type": "create",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      },
+      "silent": true
+    },
+    {
+      "type": "create",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      }
+    },
+    {
+      "type": "clear",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      },
+      "silent": true
+    },
+    {
+      "type": "clear",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      }
+    },
+    {
+      "type": "clear",
+      "source": "DEFAULT"
+    },
+    {
+      "type": "clear",
+      "source": "NAMED"
+    },
+    {
+      "type": "clear",
+      "source": "ALL"
+    },
+    {
+      "type": "drop",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      },
+      "silent": true
+    },
+    {
+      "type": "drop",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      }
+    },
+    {
+      "type": "drop",
+      "source": "DEFAULT"
+    },
+    {
+      "type": "drop",
+      "source": "NAMED"
+    },
+    {
+      "type": "drop",
+      "source": "ALL"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/load-into-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/load-into-quads.json
new file mode 100644
index 00000000..758d75c1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/load-into-quads.json
@@ -0,0 +1,11 @@
+{
+  "type": "load",
+  "source": {
+    "termType": "NamedNode",
+    "value": "http://www.w3.org/TR/skos-reference/skos.rdf"
+  },
+  "destination": {
+    "termType": "NamedNode",
+    "value": "urn:namespaces:skos"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/load-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/load-quads.json
new file mode 100644
index 00000000..ea77c14e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/load-quads.json
@@ -0,0 +1,7 @@
+{
+  "type": "load",
+  "source": {
+    "termType": "NamedNode",
+    "value": "http://www.w3.org/TR/skos-reference/skos.rdf"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-3-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-3-quads.json
new file mode 100644
index 00000000..76fa3d37
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-3-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "copy",
+  "source": "DEFAULT",
+  "destination": {
+    "termType": "NamedNode",
+    "value": "http://example.org/named"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-4-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-4-quads.json
new file mode 100644
index 00000000..8b856ab1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-4-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "move",
+  "source": "DEFAULT",
+  "destination": {
+    "termType": "NamedNode",
+    "value": "http://example.org/named"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-5-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-5-quads.json
new file mode 100644
index 00000000..aa34669f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql11-query/update/sparql-update-3-2-5-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "add",
+  "source": "DEFAULT",
+  "destination": {
+    "termType": "NamedNode",
+    "value": "http://example.org/named"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-ar-langdir-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-ar-langdir-quads.json
new file mode 100644
index 00000000..1eb220da
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-ar-langdir-quads.json
@@ -0,0 +1,44 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "مرحبا",
+          "language": "ar",
+          "direction": "rtl",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#dirLangString"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-ar-langdir.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-ar-langdir.json
index 72ec2e04..1eb220da 100644
--- a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-ar-langdir.json
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-ar-langdir.json
@@ -17,8 +17,8 @@
         "object": {
           "termType": "Literal",
           "value": "مرحبا",
-          "direction": "rtl",
           "language": "ar",
+          "direction": "rtl",
           "datatype": {
             "termType": "NamedNode",
             "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#dirLangString"
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-en-langdir-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-en-langdir-quads.json
new file mode 100644
index 00000000..559665eb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-en-langdir-quads.json
@@ -0,0 +1,44 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "hello",
+          "language": "en",
+          "direction": "ltr",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#dirLangString"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-en-langdir.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-en-langdir.json
index bd18dab3..559665eb 100644
--- a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-en-langdir.json
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql12/sparql-1-2-en-langdir.json
@@ -17,8 +17,8 @@
         "object": {
           "termType": "Literal",
           "value": "hello",
-          "direction": "ltr",
           "language": "en",
+          "direction": "ltr",
           "datatype": {
             "termType": "NamedNode",
             "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#dirLangString"
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/01-quads.json
new file mode 100644
index 00000000..f7112b5a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/01-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/02-quads.json
new file mode 100644
index 00000000..f7112b5a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/02-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/03-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/03-quads.json
new file mode 100644
index 00000000..503eb4f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/03-quads.json
@@ -0,0 +1,42 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/04-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/04-quads.json
new file mode 100644
index 00000000..503eb4f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/04-quads.json
@@ -0,0 +1,42 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/05-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/05-quads.json
new file mode 100644
index 00000000..0b1a5bbf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/05-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "a"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/06-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/06-quads.json
new file mode 100644
index 00000000..0b1a5bbf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/basic/06-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "a"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/01-quads.json
new file mode 100644
index 00000000..acd884f1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/01-quads.json
@@ -0,0 +1,29 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/02-quads.json
new file mode 100644
index 00000000..acd884f1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/02-quads.json
@@ -0,0 +1,29 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/03-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/03-quads.json
new file mode 100644
index 00000000..e6509525
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/03-quads.json
@@ -0,0 +1,86 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "pa"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "pa"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/04-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/04-quads.json
new file mode 100644
index 00000000..acd884f1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/04-quads.json
@@ -0,0 +1,29 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/05-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/05-quads.json
new file mode 100644
index 00000000..1a2815b7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/05-quads.json
@@ -0,0 +1,49 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p1"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p2"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#q2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/06-clash-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/06-clash-quads.json
new file mode 100644
index 00000000..9e6f5f40
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/bnodes/06-clash-quads.json
@@ -0,0 +1,82 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_b"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_b"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_b0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "b0"
+    },
+    {
+      "termType": "Variable",
+      "value": "b1"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/01-quads.json
new file mode 100644
index 00000000..52591fc4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/01-quads.json
@@ -0,0 +1,53 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "o"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/02-quads.json
new file mode 100644
index 00000000..e00f8267
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/02-quads.json
@@ -0,0 +1,72 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "regex",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "foo",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/03-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/03-quads.json
new file mode 100644
index 00000000..1e0bb985
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/03-quads.json
@@ -0,0 +1,85 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "regex",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "foo",
+            "language": "en",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "i",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/04-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/04-quads.json
new file mode 100644
index 00000000..3d41b23f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/04-quads.json
@@ -0,0 +1,63 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "named",
+      "name": {
+        "termType": "NamedNode",
+        "value": "http://www.w3.org/2001/XMLSchema#integer"
+      },
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/05-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/05-quads.json
new file mode 100644
index 00000000..2608b3f4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/expr/05-quads.json
@@ -0,0 +1,71 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "named",
+      "name": {
+        "termType": "NamedNode",
+        "value": "http://example.org/ns#myFunc"
+      },
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "s"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/forms/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/forms/01-quads.json
new file mode 100644
index 00000000..87b21758
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/forms/01-quads.json
@@ -0,0 +1,210 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "pa"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_4"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_4"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "57",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#integer"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_4"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "pa"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/forms/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/forms/02-quads.json
new file mode 100644
index 00000000..56b554f9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/forms/02-quads.json
@@ -0,0 +1,89 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_3"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/01-quads.json
new file mode 100644
index 00000000..0128d13b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/01-quads.json
@@ -0,0 +1,60 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "orderby",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expressions": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "start": 0,
+  "length": 5
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/02-quads.json
new file mode 100644
index 00000000..bc85510a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/02-quads.json
@@ -0,0 +1,60 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "orderby",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expressions": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "start": 3,
+  "length": 5
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/03-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/03-quads.json
new file mode 100644
index 00000000..bc85510a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/03-quads.json
@@ -0,0 +1,60 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "orderby",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expressions": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "start": 3,
+  "length": 5
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/04-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/04-quads.json
new file mode 100644
index 00000000..a5255065
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/limit-offset/04-quads.json
@@ -0,0 +1,59 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "orderby",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expressions": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "start": 3
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/01-quads.json
new file mode 100644
index 00000000..8d69886a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/01-quads.json
@@ -0,0 +1,78 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/02-quads.json
new file mode 100644
index 00000000..58c0af7b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/02-quads.json
@@ -0,0 +1,78 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#p"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/03-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/03-quads.json
new file mode 100644
index 00000000..a9f4e42b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/03-quads.json
@@ -0,0 +1,54 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/04-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/04-quads.json
new file mode 100644
index 00000000..04bc0f98
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/04-quads.json
@@ -0,0 +1,94 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/05-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/05-quads.json
new file mode 100644
index 00000000..f6c62e65
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lists/05-quads.json
@@ -0,0 +1,49 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#first"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "g_0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/01-quads.json
new file mode 100644
index 00000000..8aa2feb7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/01-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/02-quads.json
new file mode 100644
index 00000000..8aa2feb7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/02-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/03-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/03-quads.json
new file mode 100644
index 00000000..373b8701
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/03-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x\"y'z",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/04-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/04-quads.json
new file mode 100644
index 00000000..373b8701
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/04-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x\"y'z",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/05-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/05-quads.json
new file mode 100644
index 00000000..f0cde265
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/05-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x\"",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/06-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/06-quads.json
new file mode 100644
index 00000000..3ec541ea
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/06-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "x'",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/07-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/07-quads.json
new file mode 100644
index 00000000..fe51fd0c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/07-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "123",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#integer"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/08-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/08-quads.json
new file mode 100644
index 00000000..fe51fd0c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/08-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "123",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#integer"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/09-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/09-quads.json
new file mode 100644
index 00000000..34b5894c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/09-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\n\"\"\nLiteral\n",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/10-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/10-quads.json
new file mode 100644
index 00000000..97bc2ef7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/10-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\n'' \"\"\"\nLiteral\n",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/11-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/11-quads.json
new file mode 100644
index 00000000..700fbacb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/11-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\"\"\"Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/12-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/12-quads.json
new file mode 100644
index 00000000..1f3f1edf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/12-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long'''Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/13-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/13-quads.json
new file mode 100644
index 00000000..700fbacb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/13-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\"\"\"Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/14-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/14-quads.json
new file mode 100644
index 00000000..1f3f1edf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/14-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long'''Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/15-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/15-quads.json
new file mode 100644
index 00000000..db5350c5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/15-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long '' Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/16-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/16-quads.json
new file mode 100644
index 00000000..f47a4a6d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/16-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long ' Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/17-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/17-quads.json
new file mode 100644
index 00000000..3acdf11e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/17-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long''\\Literal with '\\ single quotes ",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/18-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/18-quads.json
new file mode 100644
index 00000000..5dfa5f4a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/18-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long \"\" Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/19-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/19-quads.json
new file mode 100644
index 00000000..ea5bd788
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/19-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long \" Literal",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/20-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/20-quads.json
new file mode 100644
index 00000000..951638b1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/lit/20-quads.json
@@ -0,0 +1,33 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/#p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "Long\"\"\\Literal with \"\\ single quotes",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#string"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/opt-filter/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/opt-filter/01-quads.json
new file mode 100644
index 00000000..8f3f0c5c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/opt-filter/01-quads.json
@@ -0,0 +1,103 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example/p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "v"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "y"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example/q"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "w"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ],
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "v"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "v"
+    },
+    {
+      "termType": "Variable",
+      "value": "w"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/opt-filter/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/opt-filter/02-quads.json
new file mode 100644
index 00000000..6ee01438
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/opt-filter/02-quads.json
@@ -0,0 +1,137 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example/p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "v"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "y"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example/q"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "w"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ],
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "&&",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "v"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "2",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "w"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "3",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "v"
+    },
+    {
+      "termType": "Variable",
+      "value": "w"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/01-quads.json
new file mode 100644
index 00000000..54490640
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/01-quads.json
@@ -0,0 +1,55 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "o"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/02-quads.json
new file mode 100644
index 00000000..dd075c68
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/02-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "+",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "5",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/03-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/03-quads.json
new file mode 100644
index 00000000..54490640
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/03-quads.json
@@ -0,0 +1,55 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "o"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/04-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/04-quads.json
new file mode 100644
index 00000000..d9db9c40
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/04-quads.json
@@ -0,0 +1,62 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "desc",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/05-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/05-quads.json
new file mode 100644
index 00000000..106079c5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/05-quads.json
@@ -0,0 +1,80 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "desc",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "named",
+            "name": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#func"
+            },
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "s"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/06-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/06-quads.json
new file mode 100644
index 00000000..313944f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/06-quads.json
@@ -0,0 +1,107 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "desc",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "+",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Literal",
+                  "value": "57",
+                  "datatype": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/2001/XMLSchema#integer"
+                  }
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "expression",
+        "subType": "named",
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example.org/ns#func2"
+        },
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          }
+        ]
+      },
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "s"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/07-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/07-quads.json
new file mode 100644
index 00000000..49b1ad51
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/order/07-quads.json
@@ -0,0 +1,62 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "str",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/01-quads.json
new file mode 100644
index 00000000..f7112b5a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/01-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/02-quads.json
new file mode 100644
index 00000000..048c81ef
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/02-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "a"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#b"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#c"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#x"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#y"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#z"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#x"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "y"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "z"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/03-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/03-quads.json
new file mode 100644
index 00000000..a10bf885
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/pat/03-quads.json
@@ -0,0 +1,128 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": []
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#x"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#y"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#z"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "union",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#x1"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#y1"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#z1"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#x2"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#y2"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#z2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/reduced/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/reduced/01-quads.json
new file mode 100644
index 00000000..4096c168
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/reduced/01-quads.json
@@ -0,0 +1,45 @@
+{
+  "type": "reduced",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "y"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "z"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "x"
+      },
+      {
+        "termType": "Variable",
+        "value": "y"
+      },
+      {
+        "termType": "Variable",
+        "value": "z"
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/01-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/01-quads.json
new file mode 100644
index 00000000..b1118f7d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/01-quads.json
@@ -0,0 +1,17 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": []
+      },
+      {
+        "type": "bgp",
+        "patterns": []
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/02-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/02-quads.json
new file mode 100644
index 00000000..30591a3f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/02-quads.json
@@ -0,0 +1,38 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": []
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/13-quads.json b/packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/13-quads.json
new file mode 100644
index 00000000..1f67975b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/dawg-syntax/struct/13-quads.json
@@ -0,0 +1,119 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "join",
+        "input": [
+          {
+            "type": "leftjoin",
+            "input": [
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#p"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#q"
+                    },
+                    "object": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#r"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#a"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#b"
+                    },
+                    "object": {
+                      "termType": "NamedNode",
+                      "value": "http://example.org/ns#c"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#p"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#q"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://example.org/ns#r"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#b"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#c"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/agg-empty-group-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/agg-empty-group-quads.json
new file mode 100644
index 00000000..7e2ac101
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/agg-empty-group-quads.json
@@ -0,0 +1,82 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "value"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "x"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "max",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "value"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "max"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "max"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/avg-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/avg-quads.json
new file mode 100644
index 00000000..89580e08
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/avg-quads.json
@@ -0,0 +1,73 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/dec"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variables": [],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "avg",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "avg"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "avg"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/avg-with-group-by-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/avg-with-group-by-quads.json
new file mode 100644
index 00000000..1e86b2bc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/avg-with-group-by-quads.json
@@ -0,0 +1,112 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "s"
+          }
+        ],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "avg",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "o"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "<=",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "2.0",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#decimal"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "avg"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "avg"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/count-3-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/count-3-quads.json
new file mode 100644
index 00000000..fbd72b53
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/count-3-quads.json
@@ -0,0 +1,112 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "S"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "P"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "O"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "P"
+          }
+        ],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "count",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "O"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": ">",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "2",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "C"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "P"
+    },
+    {
+      "termType": "Variable",
+      "value": "C"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/count-8b-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/count-8b-quads.json
new file mode 100644
index 00000000..835371bb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/count-8b-quads.json
@@ -0,0 +1,145 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "extend",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "S"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "O1"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              },
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "S"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/q"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "O2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variable": {
+            "termType": "Variable",
+            "value": "O12"
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "+",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "O1"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "O2"
+                }
+              }
+            ]
+          }
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "O12"
+          }
+        ],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "count",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "O1"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "C"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "var0"
+        }
+      }
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "O12"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "O12"
+    },
+    {
+      "termType": "Variable",
+      "value": "C"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/error-in-avg-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/error-in-avg-quads.json
new file mode 100644
index 00000000..5976243a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/error-in-avg-quads.json
@@ -0,0 +1,171 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "group",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "g"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.com/data/#p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "g"
+          }
+        ],
+        "aggregates": [
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "avg",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "p"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "min",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "p"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var1"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "aggregate",
+            "aggregator": "max",
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "p"
+              }
+            },
+            "distinct": false,
+            "variable": {
+              "termType": "Variable",
+              "value": "var2"
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "avg"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "var0"
+        }
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "c"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "/",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "+",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "var1"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "var2"
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "g"
+    },
+    {
+      "termType": "Variable",
+      "value": "avg"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-1-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-1-quads.json
new file mode 100644
index 00000000..6059ac47
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-1-quads.json
@@ -0,0 +1,141 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "project",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "group",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "BlankNode",
+                  "value": "g_0"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [],
+          "aggregates": [
+            {
+              "type": "expression",
+              "subType": "aggregate",
+              "aggregator": "group_concat",
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              "separator": " ",
+              "distinct": false,
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "g"
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "||",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1 22",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "22 1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-2-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-2-quads.json
new file mode 100644
index 00000000..aab9b64c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-2-quads.json
@@ -0,0 +1,458 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "project",
+          "input": {
+            "type": "extend",
+            "input": {
+              "type": "group",
+              "input": {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "BlankNode",
+                      "value": "g_0"
+                    },
+                    "predicate": {
+                      "termType": "Variable",
+                      "value": "p"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "o"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              "variables": [
+                {
+                  "termType": "Variable",
+                  "value": "p"
+                }
+              ],
+              "aggregates": [
+                {
+                  "type": "expression",
+                  "subType": "aggregate",
+                  "aggregator": "group_concat",
+                  "expression": {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Variable",
+                      "value": "o"
+                    }
+                  },
+                  "separator": " ",
+                  "distinct": false,
+                  "variable": {
+                    "termType": "Variable",
+                    "value": "var0"
+                  }
+                }
+              ]
+            },
+            "variable": {
+              "termType": "Variable",
+              "value": "g"
+            },
+            "expression": {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          },
+          "variables": [
+            {
+              "termType": "Variable",
+              "value": "p"
+            },
+            {
+              "termType": "Variable",
+              "value": "g"
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "||",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "&&",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "p"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://www.example.org/p1"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "||",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "operator",
+                      "operator": "=",
+                      "args": [
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Variable",
+                            "value": "g"
+                          }
+                        },
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Literal",
+                            "value": "1 22",
+                            "datatype": {
+                              "termType": "NamedNode",
+                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                            }
+                          }
+                        }
+                      ]
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "operator",
+                      "operator": "=",
+                      "args": [
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Variable",
+                            "value": "g"
+                          }
+                        },
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Literal",
+                            "value": "22 1",
+                            "datatype": {
+                              "termType": "NamedNode",
+                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "&&",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "p"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://www.example.org/p2"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "||",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "operator",
+                      "operator": "||",
+                      "args": [
+                        {
+                          "type": "expression",
+                          "subType": "operator",
+                          "operator": "||",
+                          "args": [
+                            {
+                              "type": "expression",
+                              "subType": "operator",
+                              "operator": "||",
+                              "args": [
+                                {
+                                  "type": "expression",
+                                  "subType": "operator",
+                                  "operator": "||",
+                                  "args": [
+                                    {
+                                      "type": "expression",
+                                      "subType": "operator",
+                                      "operator": "=",
+                                      "args": [
+                                        {
+                                          "type": "expression",
+                                          "subType": "term",
+                                          "term": {
+                                            "termType": "Variable",
+                                            "value": "g"
+                                          }
+                                        },
+                                        {
+                                          "type": "expression",
+                                          "subType": "term",
+                                          "term": {
+                                            "termType": "Literal",
+                                            "value": "aaa bb c",
+                                            "datatype": {
+                                              "termType": "NamedNode",
+                                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    },
+                                    {
+                                      "type": "expression",
+                                      "subType": "operator",
+                                      "operator": "=",
+                                      "args": [
+                                        {
+                                          "type": "expression",
+                                          "subType": "term",
+                                          "term": {
+                                            "termType": "Variable",
+                                            "value": "g"
+                                          }
+                                        },
+                                        {
+                                          "type": "expression",
+                                          "subType": "term",
+                                          "term": {
+                                            "termType": "Literal",
+                                            "value": "aaa c bb",
+                                            "datatype": {
+                                              "termType": "NamedNode",
+                                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                                            }
+                                          }
+                                        }
+                                      ]
+                                    }
+                                  ]
+                                },
+                                {
+                                  "type": "expression",
+                                  "subType": "operator",
+                                  "operator": "=",
+                                  "args": [
+                                    {
+                                      "type": "expression",
+                                      "subType": "term",
+                                      "term": {
+                                        "termType": "Variable",
+                                        "value": "g"
+                                      }
+                                    },
+                                    {
+                                      "type": "expression",
+                                      "subType": "term",
+                                      "term": {
+                                        "termType": "Literal",
+                                        "value": "bb aaa c",
+                                        "datatype": {
+                                          "termType": "NamedNode",
+                                          "value": "http://www.w3.org/2001/XMLSchema#string"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              ]
+                            },
+                            {
+                              "type": "expression",
+                              "subType": "operator",
+                              "operator": "=",
+                              "args": [
+                                {
+                                  "type": "expression",
+                                  "subType": "term",
+                                  "term": {
+                                    "termType": "Variable",
+                                    "value": "g"
+                                  }
+                                },
+                                {
+                                  "type": "expression",
+                                  "subType": "term",
+                                  "term": {
+                                    "termType": "Literal",
+                                    "value": "bb c aaa",
+                                    "datatype": {
+                                      "termType": "NamedNode",
+                                      "value": "http://www.w3.org/2001/XMLSchema#string"
+                                    }
+                                  }
+                                }
+                              ]
+                            }
+                          ]
+                        },
+                        {
+                          "type": "expression",
+                          "subType": "operator",
+                          "operator": "=",
+                          "args": [
+                            {
+                              "type": "expression",
+                              "subType": "term",
+                              "term": {
+                                "termType": "Variable",
+                                "value": "g"
+                              }
+                            },
+                            {
+                              "type": "expression",
+                              "subType": "term",
+                              "term": {
+                                "termType": "Literal",
+                                "value": "c aaa bb",
+                                "datatype": {
+                                  "termType": "NamedNode",
+                                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "operator",
+                      "operator": "=",
+                      "args": [
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Variable",
+                            "value": "g"
+                          }
+                        },
+                        {
+                          "type": "expression",
+                          "subType": "term",
+                          "term": {
+                            "termType": "Literal",
+                            "value": "c bb aaa",
+                            "datatype": {
+                              "termType": "NamedNode",
+                              "value": "http://www.w3.org/2001/XMLSchema#string"
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      },
+      "variables": [],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "count",
+          "expression": {
+            "type": "expression",
+            "subType": "wildcard",
+            "wildcard": {
+              "type": "wildcard"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var1"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "c"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var1"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "c"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-with-separator-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-with-separator-quads.json
new file mode 100644
index 00000000..d2f2c704
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/group-concat-with-separator-quads.json
@@ -0,0 +1,141 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "project",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "group",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "BlankNode",
+                  "value": "g_0"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [],
+          "aggregates": [
+            {
+              "type": "expression",
+              "subType": "aggregate",
+              "aggregator": "group_concat",
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              "separator": ":",
+              "distinct": false,
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "g"
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "||",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1:22",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "22:1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/protect-from-error-in-avg-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/protect-from-error-in-avg-quads.json
new file mode 100644
index 00000000..c41b028d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/protect-from-error-in-avg-quads.json
@@ -0,0 +1,141 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "g"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.com/data/#p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "g"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "avg",
+          "expression": {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "if",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "operator",
+                "operator": "isnumeric",
+                "args": [
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Variable",
+                      "value": "p"
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "p"
+                }
+              },
+              {
+                "type": "expression",
+                "subType": "operator",
+                "operator": "coalesce",
+                "args": [
+                  {
+                    "type": "expression",
+                    "subType": "named",
+                    "name": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#double"
+                    },
+                    "args": [
+                      {
+                        "type": "expression",
+                        "subType": "term",
+                        "term": {
+                          "termType": "Variable",
+                          "value": "p"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Literal",
+                      "value": "0",
+                      "datatype": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/2001/XMLSchema#integer"
+                      }
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "avg"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "g"
+    },
+    {
+      "termType": "Variable",
+      "value": "avg"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/sample-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/sample-quads.json
new file mode 100644
index 00000000..9cff0f3c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/aggregates/sample-quads.json
@@ -0,0 +1,174 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "project",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "group",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/dec"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [],
+          "aggregates": [
+            {
+              "type": "expression",
+              "subType": "aggregate",
+              "aggregator": "sample",
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              "distinct": false,
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "sample"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "sample"
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "||",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "||",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "=",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "sample"
+                  }
+                },
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Literal",
+                    "value": "1.0",
+                    "datatype": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#decimal"
+                    }
+                  }
+                }
+              ]
+            },
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "=",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "sample"
+                  }
+                },
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Literal",
+                    "value": "2.2",
+                    "datatype": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#decimal"
+                    }
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "sample"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "3.5",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#decimal"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/group-concat-1-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/group-concat-1-quads.json
new file mode 100644
index 00000000..6059ac47
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/group-concat-1-quads.json
@@ -0,0 +1,141 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "project",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "group",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "BlankNode",
+                  "value": "g_0"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [],
+          "aggregates": [
+            {
+              "type": "expression",
+              "subType": "aggregate",
+              "aggregator": "group_concat",
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "o"
+                }
+              },
+              "separator": " ",
+              "distinct": false,
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "g"
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "||",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1 22",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "g"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "22 1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/in-1-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/in-1-quads.json
new file mode 100644
index 00000000..610efe2a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/in-1-quads.json
@@ -0,0 +1,65 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": []
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "in",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "3",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/not-in-1-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/not-in-1-quads.json
new file mode 100644
index 00000000..8fa3a32b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/not-in-1-quads.json
@@ -0,0 +1,29 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": []
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "notin",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.json
new file mode 100644
index 00000000..4b017492
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.json
@@ -0,0 +1,28 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#Person"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.json
new file mode 100644
index 00000000..7faca6df
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.json
@@ -0,0 +1,88 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#p"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "e_aa"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_aa"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#r"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "e_dd"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_dd"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#t"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "e_bb"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_bb"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#s"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://example.org/test#a"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/syn-pname-01-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/syn-pname-01-quads.json
new file mode 100644
index 00000000..cba62ea6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/ask/syn-pname-01-quads.json
@@ -0,0 +1,7 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/01-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/01-quads.json
new file mode 100644
index 00000000..0b544ca2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/01-quads.json
@@ -0,0 +1,68 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "z"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "+",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "10",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/02-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/02-quads.json
new file mode 100644
index 00000000..46a73ebf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/02-quads.json
@@ -0,0 +1,110 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "z"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "+",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "10",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "z2"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "+",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "100",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    },
+    {
+      "termType": "Variable",
+      "value": "z2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/03-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/03-quads.json
new file mode 100644
index 00000000..fc7d5061
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/03-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "extend",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "+",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "o"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        }
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s1"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p1"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "z"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "z"
+    },
+    {
+      "termType": "Variable",
+      "value": "s1"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/04-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/04-quads.json
new file mode 100644
index 00000000..9c3ce9f0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/04-quads.json
@@ -0,0 +1,61 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "z"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "nova"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/05-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/05-quads.json
new file mode 100644
index 00000000..5d0d50ec
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/05-quads.json
@@ -0,0 +1,110 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "z"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "+",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "1",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "z"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "3",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/07-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/07-quads.json
new file mode 100644
index 00000000..130d3532
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/07-quads.json
@@ -0,0 +1,132 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "union",
+        "input": [
+          {
+            "type": "extend",
+            "input": {
+              "type": "bgp",
+              "patterns": []
+            },
+            "variable": {
+              "termType": "Variable",
+              "value": "z"
+            },
+            "expression": {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "+",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "o"
+                  }
+                },
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Literal",
+                    "value": "1",
+                    "datatype": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#integer"
+                    }
+                  }
+                }
+              ]
+            }
+          },
+          {
+            "type": "extend",
+            "input": {
+              "type": "bgp",
+              "patterns": []
+            },
+            "variable": {
+              "termType": "Variable",
+              "value": "z"
+            },
+            "expression": {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "+",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "o"
+                  }
+                },
+                {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Literal",
+                    "value": "2",
+                    "datatype": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/2001/XMLSchema#integer"
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/08-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/08-quads.json
new file mode 100644
index 00000000..5d0d50ec
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/08-quads.json
@@ -0,0 +1,110 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "z"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "+",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "o"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "1",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "z"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "3",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/10-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/10-quads.json
new file mode 100644
index 00000000..8435a129
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/10-quads.json
@@ -0,0 +1,96 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "extend",
+        "input": {
+          "type": "bgp",
+          "patterns": []
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "z"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "4",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        }
+      },
+      {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.org/p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "v"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "v"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "z"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "v"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/11-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/11-quads.json
new file mode 100644
index 00000000..98d3b627
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/bind/11-quads.json
@@ -0,0 +1,96 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "join",
+      "input": [
+        {
+          "type": "extend",
+          "input": {
+            "type": "bgp",
+            "patterns": []
+          },
+          "variable": {
+            "termType": "Variable",
+            "value": "z"
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "4",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#integer"
+              }
+            }
+          }
+        },
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.org/p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "v"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "v"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "z"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "v"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/construct-from-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/construct-from-quads.json
new file mode 100644
index 00000000..dd3dfe7c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/construct-from-quads.json
@@ -0,0 +1,65 @@
+{
+  "type": "from",
+  "input": {
+    "type": "slice",
+    "input": {
+      "type": "construct",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "template": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "start": 0,
+    "length": 100
+  },
+  "default": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.com/data"
+    }
+  ],
+  "named": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/construct-slice-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/construct-slice-quads.json
new file mode 100644
index 00000000..9bded160
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/construct-slice-quads.json
@@ -0,0 +1,55 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "construct",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "template": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "start": 0,
+  "length": 100
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere01-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere01-quads.json
new file mode 100644
index 00000000..c55afa28
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere01-quads.json
@@ -0,0 +1,50 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere02-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere02-quads.json
new file mode 100644
index 00000000..0bc95dd6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere02-quads.json
@@ -0,0 +1,90 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/s1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.org/s1"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere03-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere03-quads.json
new file mode 100644
index 00000000..707122ca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere03-quads.json
@@ -0,0 +1,90 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/s2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/s2"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://example.org/p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o2"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.org/s2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o1"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.org/s2"
+      },
+      "predicate": {
+        "termType": "NamedNode",
+        "value": "http://example.org/p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o2"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere05-modified-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere05-modified-quads.json
new file mode 100644
index 00000000..a03e854d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere05-modified-quads.json
@@ -0,0 +1,76 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "NamedNode",
+            "value": "http://example.org/o1"
+          }
+        }
+      ]
+    }
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere06-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere06-quads.json
new file mode 100644
index 00000000..b46e8721
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/construct/constructwhere06-quads.json
@@ -0,0 +1,50 @@
+{
+  "type": "construct",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "BlankNode",
+          "value": "e_s_b"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "BlankNode",
+          "value": "e_o_b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "template": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "BlankNode",
+        "value": "e_s_b"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "BlankNode",
+        "value": "e_o_b"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.json
new file mode 100644
index 00000000..c81d2577
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.json
@@ -0,0 +1,104 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": false,
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "existence",
+          "not": true,
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/exists/nested-positive-exists-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/exists/nested-positive-exists-quads.json
new file mode 100644
index 00000000..6be0fbc6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/exists/nested-positive-exists-quads.json
@@ -0,0 +1,104 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": false,
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "existence",
+          "not": false,
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p"
+                },
+                "object": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        }
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/bnode-str-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/bnode-str-quads.json
new file mode 100644
index 00000000..86a76b90
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/bnode-str-quads.json
@@ -0,0 +1,226 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "a"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.org/str"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "s1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "b"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.org/str"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "s2"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "&&",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "||",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "a"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://example.org/s1"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "a"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://example.org/s3"
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "expression",
+              "subType": "operator",
+              "operator": "||",
+              "args": [
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "b"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://example.org/s1"
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "expression",
+                  "subType": "operator",
+                  "operator": "=",
+                  "args": [
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "Variable",
+                        "value": "b"
+                      }
+                    },
+                    {
+                      "type": "expression",
+                      "subType": "term",
+                      "term": {
+                        "termType": "NamedNode",
+                        "value": "http://example.org/s3"
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "b1"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "bnode",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "s1"
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "b2"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "bnode",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "s2"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s1"
+    },
+    {
+      "termType": "Variable",
+      "value": "s2"
+    },
+    {
+      "termType": "Variable",
+      "value": "b1"
+    },
+    {
+      "termType": "Variable",
+      "value": "b2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/now-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/now-quads.json
new file mode 100644
index 00000000..75aa2b1c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/now-quads.json
@@ -0,0 +1,53 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": []
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "n"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "now",
+        "args": []
+      }
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "=",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "datatype",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "n"
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2001/XMLSchema#dateTime"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/strlang-str-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/strlang-str-quads.json
new file mode 100644
index 00000000..7e3c87ca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/functions/strlang-str-quads.json
@@ -0,0 +1,116 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/str"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "str"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "langmatches",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "lang",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "str"
+                }
+              }
+            ]
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Literal",
+              "value": "en",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#string"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "s2"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "strlang",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "str",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "str"
+              }
+            }
+          ]
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "en-US",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#string"
+            }
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "s2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/group/01-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/group/01-quads.json
new file mode 100644
index 00000000..7db4ae79
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/group/01-quads.json
@@ -0,0 +1,44 @@
+{
+  "type": "project",
+  "input": {
+    "type": "group",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example/p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "v"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ],
+    "aggregates": []
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/group/03-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/group/03-quads.json
new file mode 100644
index 00000000..acf7d314
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/group/03-quads.json
@@ -0,0 +1,112 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example/p"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "v"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://example/q"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "w"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "w"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "sample",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "v"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "S"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "w"
+    },
+    {
+      "termType": "Variable",
+      "value": "S"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/group/04-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/group/04-quads.json
new file mode 100644
index 00000000..c68d680a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/group/04-quads.json
@@ -0,0 +1,146 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "leftjoin",
+          "input": [
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/p"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "v"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            },
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/q"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "w"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "X"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "coalesce",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "w"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1605-11-05",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#date"
+                }
+              }
+            }
+          ]
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "X"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "sample",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "v"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "S"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "X"
+    },
+    {
+      "termType": "Variable",
+      "value": "S"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.json
new file mode 100644
index 00000000..07a62d5d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.json
@@ -0,0 +1,307 @@
+{
+  "type": "distinct",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "minus",
+        "input": [
+          {
+            "type": "minus",
+            "input": [
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s2"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                    },
+                    "object": {
+                      "termType": "NamedNode",
+                      "value": "http://example/Set"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  },
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s1"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                    },
+                    "object": {
+                      "termType": "NamedNode",
+                      "value": "http://example/Set"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "filter",
+                "input": {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "s1"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Set"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    },
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "s2"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Set"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    },
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "s1"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://example/member"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "x"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                "expression": {
+                  "type": "expression",
+                  "subType": "existence",
+                  "not": true,
+                  "input": {
+                    "type": "bgp",
+                    "patterns": [
+                      {
+                        "type": "pattern",
+                        "termType": "Quad",
+                        "subject": {
+                          "termType": "Variable",
+                          "value": "s2"
+                        },
+                        "predicate": {
+                          "termType": "NamedNode",
+                          "value": "http://example/member"
+                        },
+                        "object": {
+                          "termType": "Variable",
+                          "value": "x"
+                        },
+                        "graph": {
+                          "termType": "DefaultGraph",
+                          "value": ""
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            ]
+          },
+          {
+            "type": "filter",
+            "input": {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s1"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                  },
+                  "object": {
+                    "termType": "NamedNode",
+                    "value": "http://example/Set"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                },
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s2"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                  },
+                  "object": {
+                    "termType": "NamedNode",
+                    "value": "http://example/Set"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                },
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s2"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/member"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "x"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            },
+            "expression": {
+              "type": "expression",
+              "subType": "existence",
+              "not": true,
+              "input": {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s1"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://example/member"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "x"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "<",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "str",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "s1"
+                }
+              }
+            ]
+          },
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "str",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "s2"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "s1"
+      },
+      {
+        "termType": "Variable",
+        "value": "s2"
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.json
new file mode 100644
index 00000000..b4c4f20a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.json
@@ -0,0 +1,191 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "exam"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#PhysicalExamination"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "exam"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/date"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "date"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "exam"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#precedes"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#operation1"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "op"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#SurgicalProcedure"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "op"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/date"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "opDT"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": true,
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "otherExam"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#PhysicalExamination"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "otherExam"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#follows"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "exam"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "otherExam"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#precedes"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#operation1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "exam"
+    },
+    {
+      "termType": "Variable",
+      "value": "date"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/simple-minus-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/simple-minus-quads.json
new file mode 100644
index 00000000..7c7c7be9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/simple-minus-quads.json
@@ -0,0 +1,68 @@
+{
+  "type": "project",
+  "input": {
+    "type": "minus",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "uri"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2004/02/skos/core#prefLabel"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "prefLabel"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "uri"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2004/02/skos/core#broader"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "https://test.com/"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "prefLabel"
+    },
+    {
+      "termType": "Variable",
+      "value": "uri"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.json
new file mode 100644
index 00000000..c121e4c1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.json
@@ -0,0 +1,165 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "minus",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "a"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example/p1"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "b"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "a"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example/p2"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "c"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "leftjoin",
+          "input": [
+            {
+              "type": "leftjoin",
+              "input": [
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "d"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Sub"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "d"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://example/q1"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "b"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "d"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/q2"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "c"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "a"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.json
new file mode 100644
index 00000000..dfdec0c3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.json
@@ -0,0 +1,205 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "minus",
+      "input": [
+        {
+          "type": "leftjoin",
+          "input": [
+            {
+              "type": "leftjoin",
+              "input": [
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "a"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Min"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "a"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://example/p1"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "b"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "a"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/p2"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "c"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "type": "leftjoin",
+          "input": [
+            {
+              "type": "leftjoin",
+              "input": [
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "d"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://example/Sub"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "d"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://example/q1"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "b"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "d"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://example/q2"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "c"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "a"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "a"
+    },
+    {
+      "termType": "Variable",
+      "value": "b"
+    },
+    {
+      "termType": "Variable",
+      "value": "c"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/01-simple-path-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/01-simple-path-quads.json
new file mode 100644
index 00000000..11cc1f67
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/01-simple-path-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/instance#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p2"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var1"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var1"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p3"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/02-star-path-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/02-star-path-quads.json
new file mode 100644
index 00000000..44377d96
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/02-star-path-quads.json
@@ -0,0 +1,53 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/instance#a"
+    },
+    "predicate": {
+      "type": "ZeroOrMorePath",
+      "path": {
+        "type": "seq",
+        "input": [
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p1"
+            }
+          },
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p2"
+            }
+          },
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p3"
+            }
+          }
+        ]
+      }
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "x"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/08-reverse-path-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/08-reverse-path-quads.json
new file mode 100644
index 00000000..83437c53
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/08-reverse-path-quads.json
@@ -0,0 +1,28 @@
+{
+  "type": "ask",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/instance#a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/instance#b"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/09-reverse-sequence-path-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/09-reverse-sequence-path-quads.json
new file mode 100644
index 00000000..f1eb8a73
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/09-reverse-sequence-path-quads.json
@@ -0,0 +1,54 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p1"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p2"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/instance#c"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/10-path-with-negation-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/10-path-with-negation-quads.json
new file mode 100644
index 00000000..451a2339
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/10-path-with-negation-quads.json
@@ -0,0 +1,37 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/instance#a"
+    },
+    "predicate": {
+      "type": "nps",
+      "iris": [
+        {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p1"
+        },
+        {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/schema#p2"
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "x"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.json
new file mode 100644
index 00000000..82aa2465
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.json
@@ -0,0 +1,46 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/instance#a"
+    },
+    "predicate": {
+      "type": "OneOrMorePath",
+      "path": {
+        "type": "seq",
+        "input": [
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p1"
+            }
+          },
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p2"
+            }
+          }
+        ]
+      }
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "x"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/14-star-path-over-foaf-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/14-star-path-over-foaf-quads.json
new file mode 100644
index 00000000..04526770
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/14-star-path-over-foaf-quads.json
@@ -0,0 +1,59 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "path",
+      "subject": {
+        "termType": "Variable",
+        "value": "X"
+      },
+      "predicate": {
+        "type": "ZeroOrMorePath",
+        "path": {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/knows"
+          }
+        }
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "X"
+        }
+      },
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "Y"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "X"
+    },
+    {
+      "termType": "Variable",
+      "value": "Y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/14-star-path-over-foafknows-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/14-star-path-over-foafknows-quads.json
new file mode 100644
index 00000000..04526770
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/14-star-path-over-foafknows-quads.json
@@ -0,0 +1,59 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "path",
+      "subject": {
+        "termType": "Variable",
+        "value": "X"
+      },
+      "predicate": {
+        "type": "ZeroOrMorePath",
+        "path": {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/knows"
+          }
+        }
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "Y"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "X"
+        }
+      },
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "Y"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "X"
+    },
+    {
+      "termType": "Variable",
+      "value": "Y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/28a-diamond-with-loop-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/28a-diamond-with-loop-quads.json
new file mode 100644
index 00000000..62938da0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/28a-diamond-with-loop-quads.json
@@ -0,0 +1,46 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://example/a"
+    },
+    "predicate": {
+      "type": "ZeroOrOnePath",
+      "path": {
+        "type": "seq",
+        "input": [
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://example/p"
+            }
+          },
+          {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://example/p"
+            }
+          }
+        ]
+      }
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "t"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/30-operator-precedence-1-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/30-operator-precedence-1-quads.json
new file mode 100644
index 00000000..e1ea7b85
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/30-operator-precedence-1-quads.json
@@ -0,0 +1,62 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/a"
+    },
+    "predicate": {
+      "type": "alt",
+      "input": [
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p1"
+          }
+        },
+        {
+          "type": "seq",
+          "input": [
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p2"
+              }
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p3"
+              }
+            }
+          ]
+        },
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p4"
+          }
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "t"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/31-operator-precedence-2-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/31-operator-precedence-2-quads.json
new file mode 100644
index 00000000..d03e78f7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/31-operator-precedence-2-quads.json
@@ -0,0 +1,82 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "path",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://www.example.org/a"
+        },
+        "predicate": {
+          "type": "alt",
+          "input": [
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p1"
+              }
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p2"
+              }
+            }
+          ]
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "path",
+        "subject": {
+          "termType": "Variable",
+          "value": "var0"
+        },
+        "predicate": {
+          "type": "alt",
+          "input": [
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p3"
+              }
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p4"
+              }
+            }
+          ]
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "t"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/32-operator-precedence-3-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/32-operator-precedence-3-quads.json
new file mode 100644
index 00000000..7b22d376
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/32-operator-precedence-3-quads.json
@@ -0,0 +1,65 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/a"
+    },
+    "predicate": {
+      "type": "alt",
+      "input": [
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p0"
+          }
+        },
+        {
+          "type": "seq",
+          "input": [
+            {
+              "type": "inv",
+              "path": {
+                "type": "link",
+                "iri": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/p1"
+                }
+              }
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p2"
+              }
+            }
+          ]
+        },
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p3"
+          }
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "t"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/33-operator-precedence-4-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/33-operator-precedence-4-quads.json
new file mode 100644
index 00000000..75418d8c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/33-operator-precedence-4-quads.json
@@ -0,0 +1,70 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/a"
+    },
+    "predicate": {
+      "type": "alt",
+      "input": [
+        {
+          "type": "seq",
+          "input": [
+            {
+              "type": "alt",
+              "input": [
+                {
+                  "type": "link",
+                  "iri": {
+                    "termType": "NamedNode",
+                    "value": "http://www.example.org/p0"
+                  }
+                },
+                {
+                  "type": "inv",
+                  "path": {
+                    "type": "link",
+                    "iri": {
+                      "termType": "NamedNode",
+                      "value": "http://www.example.org/p1"
+                    }
+                  }
+                }
+              ]
+            },
+            {
+              "type": "link",
+              "iri": {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/p2"
+              }
+            }
+          ]
+        },
+        {
+          "type": "link",
+          "iri": {
+            "termType": "NamedNode",
+            "value": "http://www.example.org/p3"
+          }
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "t"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "t"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/37-nested-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/37-nested-quads.json
new file mode 100644
index 00000000..3b9c839f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/37-nested-quads.json
@@ -0,0 +1,50 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "path",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://example.org/A0"
+      },
+      "predicate": {
+        "type": "ZeroOrMorePath",
+        "path": {
+          "type": "ZeroOrMorePath",
+          "path": {
+            "type": "link",
+            "iri": {
+              "termType": "NamedNode",
+              "value": "http://example.org/P"
+            }
+          }
+        }
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "X"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "X"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "X"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/path-union-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/path-union-quads.json
new file mode 100644
index 00000000..a94af203
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/paths/path-union-quads.json
@@ -0,0 +1,98 @@
+{
+  "type": "project",
+  "input": {
+    "type": "union",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "item"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.wikidata.org/prop/direct/P31"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.wikidata.org/entity/Q486972"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "join",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "item"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.wikidata.org/prop/direct/P31"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "instanceOf"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "path",
+            "subject": {
+              "termType": "Variable",
+              "value": "instanceOf"
+            },
+            "predicate": {
+              "type": "OneOrMorePath",
+              "path": {
+                "type": "link",
+                "iri": {
+                  "termType": "NamedNode",
+                  "value": "http://www.wikidata.org/prop/direct/P279"
+                }
+              }
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.wikidata.org/entity/Q486972"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "instanceOf"
+    },
+    {
+      "termType": "Variable",
+      "value": "item"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service01-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service01-quads.json
new file mode 100644
index 00000000..30d0f9ac
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service01-quads.json
@@ -0,0 +1,80 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p1"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p2"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o2"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example.org/sparql"
+        },
+        "silent": false
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service02-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service02-quads.json
new file mode 100644
index 00000000..37509a0b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service02-quads.json
@@ -0,0 +1,88 @@
+{
+  "type": "project",
+  "input": {
+    "type": "leftjoin",
+    "input": [
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example1.org/sparql"
+        },
+        "silent": false
+      },
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p2"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o2"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://example2.org/sparql"
+        },
+        "silent": false
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service03-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service03-quads.json
new file mode 100644
index 00000000..463994c5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service03-quads.json
@@ -0,0 +1,88 @@
+{
+  "type": "project",
+  "input": {
+    "type": "service",
+    "input": {
+      "type": "leftjoin",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "service",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p2"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "name": {
+            "termType": "NamedNode",
+            "value": "http://example2.org/sparql"
+          },
+          "silent": false
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example1.org/sparql"
+    },
+    "silent": false
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service04-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service04-quads.json
new file mode 100644
index 00000000..a6804739
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service04-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o1"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "service",
+            "input": {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "s"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://xmlns.com/foaf/0.1/knows"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "o2"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            },
+            "name": {
+              "termType": "NamedNode",
+              "value": "http://example.org/sparql"
+            },
+            "silent": false
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "o2"
+          }
+        ],
+        "bindings": [
+          {
+            "o2": {
+              "termType": "NamedNode",
+              "value": "http://example.org/b"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service05-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service05-quads.json
new file mode 100644
index 00000000..86ba7859
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service05-quads.json
@@ -0,0 +1,126 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://purl.org/dc/elements/1.1/subject"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "projectSubject"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://rdfs.org/ns/void#sparqlEndpoint"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "service"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "regex",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "projectSubject"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "remote",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#string"
+                }
+              }
+            }
+          ]
+        }
+      },
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "project"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://usefulinc.com/ns/doap#name"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "title"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "Variable",
+          "value": "service"
+        },
+        "silent": false
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "service"
+    },
+    {
+      "termType": "Variable",
+      "value": "title"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service06-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service06-quads.json
new file mode 100644
index 00000000..52c7932b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service06-quads.json
@@ -0,0 +1,88 @@
+{
+  "type": "project",
+  "input": {
+    "type": "service",
+    "input": {
+      "type": "leftjoin",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o1"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "service",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p2"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "name": {
+            "termType": "NamedNode",
+            "value": "http://invalid.endpoint.org/sparql"
+          },
+          "silent": true
+        }
+      ]
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example1.org/sparql"
+    },
+    "silent": false
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service07-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service07-quads.json
new file mode 100644
index 00000000..e2e30718
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/service/service07-quads.json
@@ -0,0 +1,80 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "service",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p2"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o2"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "name": {
+          "termType": "NamedNode",
+          "value": "http://invalid.endpoint.org/sparql"
+        },
+        "silent": true
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/06-subquery-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/06-subquery-quads.json
new file mode 100644
index 00000000..50b54865
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/06-subquery-quads.json
@@ -0,0 +1,51 @@
+{
+  "type": "project",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "y"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "x"
+      },
+      {
+        "termType": "Variable",
+        "value": "y"
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.json
new file mode 100644
index 00000000..d7dcad97
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.json
@@ -0,0 +1,116 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "project",
+        "input": {
+          "type": "extend",
+          "input": {
+            "type": "group",
+            "input": {
+              "type": "bgp",
+              "patterns": [
+                {
+                  "type": "pattern",
+                  "termType": "Quad",
+                  "subject": {
+                    "termType": "Variable",
+                    "value": "x"
+                  },
+                  "predicate": {
+                    "termType": "NamedNode",
+                    "value": "http://www.example.org/schema#p"
+                  },
+                  "object": {
+                    "termType": "Variable",
+                    "value": "y"
+                  },
+                  "graph": {
+                    "termType": "DefaultGraph",
+                    "value": ""
+                  }
+                }
+              ]
+            },
+            "variables": [],
+            "aggregates": [
+              {
+                "type": "expression",
+                "subType": "aggregate",
+                "aggregator": "max",
+                "expression": {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "y"
+                  }
+                },
+                "distinct": false,
+                "variable": {
+                  "termType": "Variable",
+                  "value": "var0"
+                }
+              }
+            ]
+          },
+          "variable": {
+            "termType": "Variable",
+            "value": "max"
+          },
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "var0"
+            }
+          }
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "max"
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "max"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "max"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/09-nested-subqueries-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/09-nested-subqueries-quads.json
new file mode 100644
index 00000000..e851a62d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/09-nested-subqueries-quads.json
@@ -0,0 +1,86 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "project",
+        "input": {
+          "type": "project",
+          "input": {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "x"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://www.example.org/schema#q"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "t"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          "variables": [
+            {
+              "termType": "Variable",
+              "value": "x"
+            }
+          ]
+        },
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "x"
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "x"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "y"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.json
new file mode 100644
index 00000000..cbd4e8b1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.json
@@ -0,0 +1,127 @@
+{
+  "type": "project",
+  "input": {
+    "type": "orderby",
+    "input": {
+      "type": "join",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "BlankNode",
+                "value": "g_0"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2000/01/rdf-schema#label"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "L"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            },
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "O"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://www.example.orghasItem"
+              },
+              "object": {
+                "termType": "BlankNode",
+                "value": "g_0"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "slice",
+          "input": {
+            "type": "distinct",
+            "input": {
+              "type": "project",
+              "input": {
+                "type": "orderby",
+                "input": {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "O"
+                      },
+                      "predicate": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+                      },
+                      "object": {
+                        "termType": "NamedNode",
+                        "value": "http://www.example.orgOrder"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                "expressions": [
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Variable",
+                      "value": "O"
+                    }
+                  }
+                ]
+              },
+              "variables": [
+                {
+                  "termType": "Variable",
+                  "value": "O"
+                }
+              ]
+            }
+          },
+          "start": 0,
+          "length": 2
+        }
+      ]
+    },
+    "expressions": [
+      {
+        "type": "expression",
+        "subType": "term",
+        "term": {
+          "termType": "Variable",
+          "value": "L"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "L"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/aggregate-15-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/aggregate-15-quads.json
new file mode 100644
index 00000000..75624028
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/aggregate-15-quads.json
@@ -0,0 +1,53 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "bgp",
+        "patterns": []
+      },
+      "variables": [],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "group_concat",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "x"
+            }
+          },
+          "separator": ";",
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "y"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/bindscope1-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/bindscope1-quads.json
new file mode 100644
index 00000000..fc48b935
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/bindscope1-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "extend",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "NamedNode",
+                "value": "http://www.example.orgs"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://www.example.orgp"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "o1"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "+",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "1",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "o"
+              }
+            }
+          ]
+        }
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://www.example.orgs"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.example.orgq"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-oneof-01-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-oneof-01-quads.json
new file mode 100644
index 00000000..ecdf2b37
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-oneof-01-quads.json
@@ -0,0 +1,111 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "notin",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "2",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "+",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "s"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Literal",
+                "value": "57",
+                "datatype": {
+                  "termType": "NamedNode",
+                  "value": "http://www.w3.org/2001/XMLSchema#integer"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-oneof-03-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-oneof-03-quads.json
new file mode 100644
index 00000000..8d2b15ab
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-oneof-03-quads.json
@@ -0,0 +1,80 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "operator",
+      "operator": "in",
+      "args": [
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Variable",
+            "value": "o"
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "1",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#integer"
+            }
+          }
+        },
+        {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "NamedNode",
+            "value": "x:x"
+          }
+        }
+      ]
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-subquery-02-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-subquery-02-quads.json
new file mode 100644
index 00000000..84c54ac1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/syntax/syntax-subquery-02-quads.json
@@ -0,0 +1,59 @@
+{
+  "type": "project",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "s"
+          },
+          "predicate": {
+            "termType": "Variable",
+            "value": "p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "o"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "o"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/01-bind-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/01-bind-quads.json
new file mode 100644
index 00000000..696ed8e9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/01-bind-quads.json
@@ -0,0 +1,84 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "book"
+          }
+        ],
+        "bindings": [
+          {
+            "book": {
+              "termType": "NamedNode",
+              "value": "http://example.org/book/book1"
+            }
+          }
+        ]
+      },
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://purl.org/dc/elements/1.1/title"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "title"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#price"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "price"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "book"
+    },
+    {
+      "termType": "Variable",
+      "value": "title"
+    },
+    {
+      "termType": "Variable",
+      "value": "price"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.json
new file mode 100644
index 00000000..b03aa727
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.json
@@ -0,0 +1,92 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p1"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p2"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o2"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "o1"
+          },
+          {
+            "termType": "Variable",
+            "value": "o2"
+          }
+        ],
+        "bindings": [
+          {
+            "o1": {
+              "termType": "Literal",
+              "value": "Alan",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#string"
+              }
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.json
new file mode 100644
index 00000000..e3db1304
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.json
@@ -0,0 +1,98 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p1"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o1"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p2"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o2"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "o1"
+          },
+          {
+            "termType": "Variable",
+            "value": "o2"
+          }
+        ],
+        "bindings": [
+          {
+            "o2": {
+              "termType": "Literal",
+              "value": "Alan",
+              "datatype": {
+                "termType": "NamedNode",
+                "value": "http://www.w3.org/2001/XMLSchema#string"
+              }
+            }
+          },
+          {
+            "o1": {
+              "termType": "NamedNode",
+              "value": "http://example.org/b"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.json
new file mode 100644
index 00000000..43067ff4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.json
@@ -0,0 +1,94 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "leftjoin",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "Variable",
+                  "value": "p1"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o1"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://xmlns.com/foaf/0.1/knows"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "o2"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "o2"
+          }
+        ],
+        "bindings": [
+          {
+            "o2": {
+              "termType": "NamedNode",
+              "value": "http://example.org/b"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o1"
+    },
+    {
+      "termType": "Variable",
+      "value": "o2"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.json
new file mode 100644
index 00000000..c4202e0c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.json
@@ -0,0 +1,84 @@
+{
+  "type": "project",
+  "input": {
+    "type": "join",
+    "input": [
+      {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://purl.org/dc/elements/1.1/title"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "title"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "book"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://example.org/ns#price"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "price"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      {
+        "type": "values",
+        "variables": [
+          {
+            "termType": "Variable",
+            "value": "book"
+          }
+        ],
+        "bindings": [
+          {
+            "book": {
+              "termType": "NamedNode",
+              "value": "http://example.org/book/book1"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "book"
+    },
+    {
+      "termType": "Variable",
+      "value": "title"
+    },
+    {
+      "termType": "Variable",
+      "value": "price"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-subquery-values-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-subquery-values-quads.json
new file mode 100644
index 00000000..34242ed2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/post-subquery-values-quads.json
@@ -0,0 +1,77 @@
+{
+  "type": "project",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "join",
+      "input": [
+        {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "s"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "p"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "o"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        {
+          "type": "values",
+          "variables": [
+            {
+              "termType": "Variable",
+              "value": "o"
+            }
+          ],
+          "bindings": [
+            {
+              "o": {
+                "termType": "NamedNode",
+                "value": "http://example.org/b"
+              }
+            }
+          ]
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      },
+      {
+        "termType": "Variable",
+        "value": "p"
+      },
+      {
+        "termType": "Variable",
+        "value": "s"
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/values-many-once-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/values-many-once-quads.json
new file mode 100644
index 00000000..2455a10a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/values/values-many-once-quads.json
@@ -0,0 +1,38 @@
+{
+  "type": "project",
+  "input": {
+    "type": "values",
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "y"
+      },
+      {
+        "termType": "Variable",
+        "value": "z"
+      }
+    ],
+    "bindings": [
+      {
+        "y": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#a"
+        },
+        "z": {
+          "termType": "NamedNode",
+          "value": "http://example.com/ns#b"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "Variable",
+      "value": "z"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.1-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.1-quads.json
new file mode 100644
index 00000000..4d1a81aa
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.1-quads.json
@@ -0,0 +1,13 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "terms": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.2a-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.2a-quads.json
new file mode 100644
index 00000000..73a557d8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.2a-quads.json
@@ -0,0 +1,34 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/mbox"
+        },
+        "object": {
+          "termType": "NamedNode",
+          "value": "mailto:alice@org"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "terms": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.2c-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.2c-quads.json
new file mode 100644
index 00000000..5963b35f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/16.4.2c-quads.json
@@ -0,0 +1,42 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/knows"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "terms": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/star-empty-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/star-empty-quads.json
new file mode 100644
index 00000000..26ca801b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/star-empty-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": []
+  },
+  "terms": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/star-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/star-quads.json
new file mode 100644
index 00000000..3c081186
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/describe/star-quads.json
@@ -0,0 +1,38 @@
+{
+  "type": "describe",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "x"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "y"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "terms": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    },
+    {
+      "termType": "Variable",
+      "value": "y"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/empty-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/empty-quads.json
new file mode 100644
index 00000000..0bb9155f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/empty-quads.json
@@ -0,0 +1,3 @@
+{
+  "type": "nop"
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/existence-subquery-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/existence-subquery-quads.json
new file mode 100644
index 00000000..7a597c7c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/existence-subquery-quads.json
@@ -0,0 +1,148 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "a"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "https://mydom2#predB"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "b"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": false,
+      "input": {
+        "type": "join",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "var0"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "https://mydom2#predN"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "q"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "project",
+            "input": {
+              "type": "extend",
+              "input": {
+                "type": "extend",
+                "input": {
+                  "type": "bgp",
+                  "patterns": [
+                    {
+                      "type": "pattern",
+                      "termType": "Quad",
+                      "subject": {
+                        "termType": "Variable",
+                        "value": "_s"
+                      },
+                      "predicate": {
+                        "termType": "Variable",
+                        "value": "p"
+                      },
+                      "object": {
+                        "termType": "Variable",
+                        "value": "_o"
+                      },
+                      "graph": {
+                        "termType": "DefaultGraph",
+                        "value": ""
+                      }
+                    }
+                  ]
+                },
+                "variable": {
+                  "termType": "Variable",
+                  "value": "q2"
+                },
+                "expression": {
+                  "type": "expression",
+                  "subType": "term",
+                  "term": {
+                    "termType": "Variable",
+                    "value": "_s"
+                  }
+                }
+              },
+              "variable": {
+                "termType": "Variable",
+                "value": "var0"
+              },
+              "expression": {
+                "type": "expression",
+                "subType": "term",
+                "term": {
+                  "termType": "Variable",
+                  "value": "_o"
+                }
+              }
+            },
+            "variables": [
+              {
+                "termType": "Variable",
+                "value": "q2"
+              },
+              {
+                "termType": "Variable",
+                "value": "var0"
+              }
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "s"
+    },
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "o"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/filter-union-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/filter-union-quads.json
new file mode 100644
index 00000000..f1e5d560
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/filter-union-quads.json
@@ -0,0 +1,63 @@
+{
+  "type": "project",
+  "input": {
+    "type": "union",
+    "input": [
+      {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": []
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "term",
+          "term": {
+            "termType": "Literal",
+            "value": "false",
+            "datatype": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2001/XMLSchema#boolean"
+            }
+          }
+        }
+      },
+      {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": []
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "this"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "NamedNode",
+                "value": "http://example.org/InvalidResource"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "this"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.1-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.1-quads.json
new file mode 100644
index 00000000..b94a2fce
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.1-quads.json
@@ -0,0 +1,44 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/name"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "name"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "name"
+      }
+    ]
+  },
+  "default": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/aliceFoaf"
+    }
+  ],
+  "named": []
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.2-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.2-quads.json
new file mode 100644
index 00000000..943b2e7e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.2-quads.json
@@ -0,0 +1,48 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/name"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "name"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "name"
+      }
+    ]
+  },
+  "default": [],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/alice"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/bob"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.3-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.3-quads.json
new file mode 100644
index 00000000..6d107fed
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.2.3-quads.json
@@ -0,0 +1,81 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "g"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://purl.org/dc/elements/1.1/publisher"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "who"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "mbox"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "g"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "who"
+      },
+      {
+        "termType": "Variable",
+        "value": "g"
+      },
+      {
+        "termType": "Variable",
+        "value": "mbox"
+      }
+    ]
+  },
+  "default": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/dft.ttl"
+    }
+  ],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/alice"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/bob"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.1-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.1-quads.json
new file mode 100644
index 00000000..1cbac971
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.1-quads.json
@@ -0,0 +1,72 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "mailto:bob@work.example"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "src"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/nick"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "bobNick"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "src"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "src"
+      },
+      {
+        "termType": "Variable",
+        "value": "bobNick"
+      }
+    ]
+  },
+  "default": [],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/aliceFoaf"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/bobFoaf"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.2-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.2-quads.json
new file mode 100644
index 00000000..8010b45e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.2-quads.json
@@ -0,0 +1,68 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "mailto:bob@work.example"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/bobFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/nick"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "nick"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/bobFoaf"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "nick"
+      }
+    ]
+  },
+  "default": [],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/aliceFoaf"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/bobFoaf"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.3-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.3-quads.json
new file mode 100644
index 00000000..2c88d1d1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.3-quads.json
@@ -0,0 +1,176 @@
+{
+  "type": "from",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "alice"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "mailto:alice@work.example"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "alice"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/knows"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "whom"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "whom"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "mbox"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "whom"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/2000/01/rdf-schema#seeAlso"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "ppd"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "ppd"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+          },
+          "object": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/PersonalProfileDocument"
+          },
+          "graph": {
+            "termType": "NamedNode",
+            "value": "http://example.org/foaf/aliceFoaf"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "w"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/mbox"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "mbox"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "ppd"
+          }
+        },
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "w"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://xmlns.com/foaf/0.1/nick"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "nick"
+          },
+          "graph": {
+            "termType": "Variable",
+            "value": "ppd"
+          }
+        }
+      ]
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "mbox"
+      },
+      {
+        "termType": "Variable",
+        "value": "nick"
+      },
+      {
+        "termType": "Variable",
+        "value": "ppd"
+      }
+    ]
+  },
+  "default": [],
+  "named": [
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/aliceFoaf"
+    },
+    {
+      "termType": "NamedNode",
+      "value": "http://example.org/foaf/bobFoaf"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.4-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.4-quads.json
new file mode 100644
index 00000000..0208594f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/from/13.3.4-quads.json
@@ -0,0 +1,102 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://purl.org/dc/elements/1.1/publisher"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "name"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "g"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://purl.org/dc/elements/1.1/date"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "date"
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/name"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "name"
+        },
+        "graph": {
+          "termType": "Variable",
+          "value": "g"
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "person"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/mbox"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "mbox"
+        },
+        "graph": {
+          "termType": "Variable",
+          "value": "g"
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "name"
+    },
+    {
+      "termType": "Variable",
+      "value": "mbox"
+    },
+    {
+      "termType": "Variable",
+      "value": "date"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/group-by-no-var-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/group-by-no-var-quads.json
new file mode 100644
index 00000000..9970c161
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/group-by-no-var-quads.json
@@ -0,0 +1,100 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "group",
+      "input": {
+        "type": "extend",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "x"
+              },
+              "predicate": {
+                "termType": "Variable",
+                "value": "y"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "z"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "variable": {
+          "termType": "Variable",
+          "value": "var1"
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "str",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "x"
+              }
+            }
+          ]
+        }
+      },
+      "variables": [
+        {
+          "termType": "Variable",
+          "value": "var1"
+        }
+      ],
+      "aggregates": [
+        {
+          "type": "expression",
+          "subType": "aggregate",
+          "aggregator": "max",
+          "expression": {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "y"
+            }
+          },
+          "distinct": false,
+          "variable": {
+            "termType": "Variable",
+            "value": "var0"
+          }
+        }
+      ]
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "yy"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "var0"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "yy"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/negate-and-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/negate-and-quads.json
new file mode 100644
index 00000000..28c57bf3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/negate-and-quads.json
@@ -0,0 +1,117 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "filter",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "c"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+            },
+            "object": {
+              "termType": "NamedNode",
+              "value": "http://www.w3.org/2002/07/owl#Class"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "!",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "operator",
+            "operator": "&&",
+            "args": [
+              {
+                "type": "expression",
+                "subType": "operator",
+                "operator": "bound",
+                "args": [
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Variable",
+                      "value": "c"
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "expression",
+                "subType": "operator",
+                "operator": "regex",
+                "args": [
+                  {
+                    "type": "expression",
+                    "subType": "operator",
+                    "operator": "str",
+                    "args": [
+                      {
+                        "type": "expression",
+                        "subType": "term",
+                        "term": {
+                          "termType": "Variable",
+                          "value": "c"
+                        }
+                      }
+                    ]
+                  },
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Literal",
+                      "value": "^toto",
+                      "datatype": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/2001/XMLSchema#string"
+                      }
+                    }
+                  },
+                  {
+                    "type": "expression",
+                    "subType": "term",
+                    "term": {
+                      "termType": "Literal",
+                      "value": "i",
+                      "datatype": {
+                        "termType": "NamedNode",
+                        "value": "http://www.w3.org/2001/XMLSchema#string"
+                      }
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "c"
+      }
+    ]
+  },
+  "start": 0,
+  "length": 10
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/negated-path-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/negated-path-quads.json
new file mode 100644
index 00000000..7e1f68fb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/negated-path-quads.json
@@ -0,0 +1,38 @@
+{
+  "type": "slice",
+  "input": {
+    "type": "project",
+    "input": {
+      "type": "path",
+      "subject": {
+        "termType": "NamedNode",
+        "value": "http://dbpedia.org/resource/12_Monkeys"
+      },
+      "predicate": {
+        "type": "nps",
+        "iris": [
+          {
+            "termType": "NamedNode",
+            "value": "http://dbpedia.org/ontology/starring"
+          }
+        ]
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "DefaultGraph",
+        "value": ""
+      }
+    },
+    "variables": [
+      {
+        "termType": "Variable",
+        "value": "o"
+      }
+    ]
+  },
+  "start": 0,
+  "length": 100
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/nested-union-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/nested-union-quads.json
new file mode 100644
index 00000000..9bfbb998
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/nested-union-quads.json
@@ -0,0 +1,196 @@
+{
+  "type": "project",
+  "input": {
+    "type": "union",
+    "input": [
+      {
+        "type": "join",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://xlabelA"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "pLabel"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "union",
+            "input": [
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://xlabelC"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "Label"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://xlabelD"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "label"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      },
+      {
+        "type": "join",
+        "input": [
+          {
+            "type": "bgp",
+            "patterns": [
+              {
+                "type": "pattern",
+                "termType": "Quad",
+                "subject": {
+                  "termType": "Variable",
+                  "value": "s"
+                },
+                "predicate": {
+                  "termType": "NamedNode",
+                  "value": "http://xlabelB"
+                },
+                "object": {
+                  "termType": "Variable",
+                  "value": "pLabel"
+                },
+                "graph": {
+                  "termType": "DefaultGraph",
+                  "value": ""
+                }
+              }
+            ]
+          },
+          {
+            "type": "union",
+            "input": [
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://xlabelC"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "Label"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              },
+              {
+                "type": "bgp",
+                "patterns": [
+                  {
+                    "type": "pattern",
+                    "termType": "Quad",
+                    "subject": {
+                      "termType": "Variable",
+                      "value": "s"
+                    },
+                    "predicate": {
+                      "termType": "NamedNode",
+                      "value": "http://xlabelD"
+                    },
+                    "object": {
+                      "termType": "Variable",
+                      "value": "label"
+                    },
+                    "graph": {
+                      "termType": "DefaultGraph",
+                      "value": ""
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "label"
+    },
+    {
+      "termType": "Variable",
+      "value": "Label"
+    },
+    {
+      "termType": "Variable",
+      "value": "pLabel"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/path-inverse-negation-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/path-inverse-negation-quads.json
new file mode 100644
index 00000000..50ec3bdc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/path-inverse-negation-quads.json
@@ -0,0 +1,50 @@
+{
+  "type": "project",
+  "input": {
+    "type": "path",
+    "subject": {
+      "termType": "NamedNode",
+      "value": "http://www.example.org/instance#a"
+    },
+    "predicate": {
+      "type": "alt",
+      "input": [
+        {
+          "type": "nps",
+          "iris": [
+            {
+              "termType": "NamedNode",
+              "value": "http://www.example.org/schema#p1"
+            }
+          ]
+        },
+        {
+          "type": "inv",
+          "path": {
+            "type": "nps",
+            "iris": [
+              {
+                "termType": "NamedNode",
+                "value": "http://www.example.org/schema#p2"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "object": {
+      "termType": "Variable",
+      "value": "x"
+    },
+    "graph": {
+      "termType": "DefaultGraph",
+      "value": ""
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/project-filter-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/project-filter-quads.json
new file mode 100644
index 00000000..046560a4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/project-filter-quads.json
@@ -0,0 +1,97 @@
+{
+  "type": "project",
+  "input": {
+    "type": "filter",
+    "input": {
+      "type": "bgp",
+      "patterns": [
+        {
+          "type": "pattern",
+          "termType": "Quad",
+          "subject": {
+            "termType": "Variable",
+            "value": "x"
+          },
+          "predicate": {
+            "termType": "NamedNode",
+            "value": "http://example.com/p"
+          },
+          "object": {
+            "termType": "Variable",
+            "value": "n"
+          },
+          "graph": {
+            "termType": "DefaultGraph",
+            "value": ""
+          }
+        }
+      ]
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "existence",
+      "not": true,
+      "input": {
+        "type": "filter",
+        "input": {
+          "type": "bgp",
+          "patterns": [
+            {
+              "type": "pattern",
+              "termType": "Quad",
+              "subject": {
+                "termType": "Variable",
+                "value": "x"
+              },
+              "predicate": {
+                "termType": "NamedNode",
+                "value": "http://example.com/q"
+              },
+              "object": {
+                "termType": "Variable",
+                "value": "m"
+              },
+              "graph": {
+                "termType": "DefaultGraph",
+                "value": ""
+              }
+            }
+          ]
+        },
+        "expression": {
+          "type": "expression",
+          "subType": "operator",
+          "operator": "=",
+          "args": [
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "n"
+              }
+            },
+            {
+              "type": "expression",
+              "subType": "term",
+              "term": {
+                "termType": "Variable",
+                "value": "m"
+              }
+            }
+          ]
+        }
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "n"
+    },
+    {
+      "termType": "Variable",
+      "value": "x"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/unused-extend-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/unused-extend-quads.json
new file mode 100644
index 00000000..18831483
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/unused-extend-quads.json
@@ -0,0 +1,99 @@
+{
+  "type": "project",
+  "input": {
+    "type": "extend",
+    "input": {
+      "type": "extend",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://mydom#startTime"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "st"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://mydom#endTime"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "et"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "variable": {
+        "termType": "Variable",
+        "value": "duration"
+      },
+      "expression": {
+        "type": "expression",
+        "subType": "operator",
+        "operator": "-",
+        "args": [
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "et"
+            }
+          },
+          {
+            "type": "expression",
+            "subType": "term",
+            "term": {
+              "termType": "Variable",
+              "value": "st"
+            }
+          }
+        ]
+      }
+    },
+    "variable": {
+      "termType": "Variable",
+      "value": "d"
+    },
+    "expression": {
+      "type": "expression",
+      "subType": "term",
+      "term": {
+        "termType": "Variable",
+        "value": "duration"
+      }
+    }
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "d"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/clear-drop-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/clear-drop-quads.json
new file mode 100644
index 00000000..0e95dea8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/clear-drop-quads.json
@@ -0,0 +1,74 @@
+{
+  "type": "compositeupdate",
+  "updates": [
+    {
+      "type": "create",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      },
+      "silent": true
+    },
+    {
+      "type": "create",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      }
+    },
+    {
+      "type": "clear",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      },
+      "silent": true
+    },
+    {
+      "type": "clear",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      }
+    },
+    {
+      "type": "clear",
+      "source": "DEFAULT"
+    },
+    {
+      "type": "clear",
+      "source": "NAMED"
+    },
+    {
+      "type": "clear",
+      "source": "ALL"
+    },
+    {
+      "type": "drop",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      },
+      "silent": true
+    },
+    {
+      "type": "drop",
+      "source": {
+        "termType": "NamedNode",
+        "value": "ex:graph"
+      }
+    },
+    {
+      "type": "drop",
+      "source": "DEFAULT"
+    },
+    {
+      "type": "drop",
+      "source": "NAMED"
+    },
+    {
+      "type": "drop",
+      "source": "ALL"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/load-into-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/load-into-quads.json
new file mode 100644
index 00000000..758d75c1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/load-into-quads.json
@@ -0,0 +1,11 @@
+{
+  "type": "load",
+  "source": {
+    "termType": "NamedNode",
+    "value": "http://www.w3.org/TR/skos-reference/skos.rdf"
+  },
+  "destination": {
+    "termType": "NamedNode",
+    "value": "urn:namespaces:skos"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/load-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/load-quads.json
new file mode 100644
index 00000000..ea77c14e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/load-quads.json
@@ -0,0 +1,7 @@
+{
+  "type": "load",
+  "source": {
+    "termType": "NamedNode",
+    "value": "http://www.w3.org/TR/skos-reference/skos.rdf"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-3-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-3-quads.json
new file mode 100644
index 00000000..76fa3d37
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-3-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "copy",
+  "source": "DEFAULT",
+  "destination": {
+    "termType": "NamedNode",
+    "value": "http://example.org/named"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-4-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-4-quads.json
new file mode 100644
index 00000000..8b856ab1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-4-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "move",
+  "source": "DEFAULT",
+  "destination": {
+    "termType": "NamedNode",
+    "value": "http://example.org/named"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-5-quads.json b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-5-quads.json
new file mode 100644
index 00000000..aa34669f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql11-query/update/sparql-update-3-2-5-quads.json
@@ -0,0 +1,8 @@
+{
+  "type": "add",
+  "source": "DEFAULT",
+  "destination": {
+    "termType": "NamedNode",
+    "value": "http://example.org/named"
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-ar-langdir-quads.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-ar-langdir-quads.json
new file mode 100644
index 00000000..1eb220da
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-ar-langdir-quads.json
@@ -0,0 +1,44 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "مرحبا",
+          "language": "ar",
+          "direction": "rtl",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#dirLangString"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-ar-langdir.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-ar-langdir.json
index 72ec2e04..1eb220da 100644
--- a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-ar-langdir.json
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-ar-langdir.json
@@ -17,8 +17,8 @@
         "object": {
           "termType": "Literal",
           "value": "مرحبا",
-          "direction": "rtl",
           "language": "ar",
+          "direction": "rtl",
           "datatype": {
             "termType": "NamedNode",
             "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#dirLangString"
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-en-langdir-quads.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-en-langdir-quads.json
new file mode 100644
index 00000000..559665eb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-en-langdir-quads.json
@@ -0,0 +1,44 @@
+{
+  "type": "project",
+  "input": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Literal",
+          "value": "hello",
+          "language": "en",
+          "direction": "ltr",
+          "datatype": {
+            "termType": "NamedNode",
+            "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#dirLangString"
+          }
+        },
+        "graph": {
+          "termType": "DefaultGraph",
+          "value": ""
+        }
+      }
+    ]
+  },
+  "variables": [
+    {
+      "termType": "Variable",
+      "value": "p"
+    },
+    {
+      "termType": "Variable",
+      "value": "s"
+    }
+  ]
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-en-langdir.json b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-en-langdir.json
index bd18dab3..559665eb 100644
--- a/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-en-langdir.json
+++ b/packages/test-utils/statics/algebra/algebra/sparql12/sparql-1-2-en-langdir.json
@@ -17,8 +17,8 @@
         "object": {
           "termType": "Literal",
           "value": "hello",
-          "direction": "ltr",
           "language": "en",
+          "direction": "ltr",
           "datatype": {
             "termType": "NamedNode",
             "value": "http://www.w3.org/1999/02/22-rdf-syntax-ns#dirLangString"
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/01-quads.sparql
new file mode 100644
index 00000000..81fe9632
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/01-quads.sparql
@@ -0,0 +1,2 @@
+SELECT * WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/02-quads.sparql
new file mode 100644
index 00000000..81fe9632
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/02-quads.sparql
@@ -0,0 +1,2 @@
+SELECT * WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/03-quads.sparql
new file mode 100644
index 00000000..00bd8ee8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/03-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x ?y ?z WHERE {
+  ?x ?y ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/04-quads.sparql
new file mode 100644
index 00000000..00bd8ee8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/04-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x ?y ?z WHERE {
+  ?x ?y ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/05-quads.sparql
new file mode 100644
index 00000000..89de5cd3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?a ?b ?c ?x ?y ?z WHERE {
+  ?x ?y ?z .
+  ?a ?b ?c .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/06-quads.sparql
new file mode 100644
index 00000000..89de5cd3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/basic/06-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?a ?b ?c ?x ?y ?z WHERE {
+  ?x ?y ?z .
+  ?a ?b ?c .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/01-quads.sparql
new file mode 100644
index 00000000..7f985da1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/01-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  _:g_0 <http://example.org/ns#p> <http://example.org/ns#q> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/02-quads.sparql
new file mode 100644
index 00000000..7f985da1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/02-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  _:g_0 <http://example.org/ns#p> <http://example.org/ns#q> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/03-quads.sparql
new file mode 100644
index 00000000..8a57744b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/03-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?b ?pa ?x ?y WHERE {
+  _:g_0 ?x ?y .
+  _:g_1 ?pa ?b .
+  _:g_0 <http://example.org/ns#p> _:g_1 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/04-quads.sparql
new file mode 100644
index 00000000..7f985da1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/04-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  _:g_0 <http://example.org/ns#p> <http://example.org/ns#q> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/05-quads.sparql
new file mode 100644
index 00000000..497d75c6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT * WHERE {
+  _:e_a <http://example.org/ns#p1> <http://example.org/ns#q1> .
+  _:e_a <http://example.org/ns#p2> <http://example.org/ns#q2> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/06-clash-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/06-clash-quads.sparql
new file mode 100644
index 00000000..7086a69b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/bnodes/06-clash-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?b ?b0 ?b1 WHERE {
+  _:e_b <http://example.org/ns#p> ?b .
+  _:e_b <http://example.org/ns#p> ?b0 .
+  _:e_b0 <http://example.org/ns#p> ?b1 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/01-quads.sparql
new file mode 100644
index 00000000..3b42a085
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( ?o )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/02-quads.sparql
new file mode 100644
index 00000000..cced0298
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/02-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( REGEX( ?o , "foo"^^<http://www.w3.org/2001/XMLSchema#string> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/03-quads.sparql
new file mode 100644
index 00000000..55d0b4bc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/03-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( REGEX( ?o , "foo"@en , "i"^^<http://www.w3.org/2001/XMLSchema#string> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/04-quads.sparql
new file mode 100644
index 00000000..8d8f4a5c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/04-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( <http://www.w3.org/2001/XMLSchema#integer> ( ?o ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/05-quads.sparql
new file mode 100644
index 00000000..9287e44f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/expr/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( <http://example.org/ns#myFunc> ( ?s , ?o ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/forms/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/forms/01-quads.sparql
new file mode 100644
index 00000000..01093619
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/forms/01-quads.sparql
@@ -0,0 +1,11 @@
+SELECT ?b ?pa ?x ?y WHERE {
+  _:g_0 ?x ?y .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:g_0 .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  _:g_2 ?pa ?b .
+  _:g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:g_2 .
+  _:g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:g_4 .
+  _:g_4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "57"^^<http://www.w3.org/2001/XMLSchema#integer> .
+  _:g_4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  _:g_1 <http://example.org/ns#p> _:g_3 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/forms/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/forms/02-quads.sparql
new file mode 100644
index 00000000..ff57c96b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/forms/02-quads.sparql
@@ -0,0 +1,6 @@
+SELECT * WHERE {
+  _:g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:g_0 .
+  _:g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:g_3 .
+  _:g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:g_1 .
+  _:g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/01-quads.sparql
new file mode 100644
index 00000000..1da2a1a2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/01-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
+LIMIT 5
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/02-quads.sparql
new file mode 100644
index 00000000..55736f1d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/02-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
+LIMIT 5 OFFSET 3
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/03-quads.sparql
new file mode 100644
index 00000000..55736f1d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/03-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
+LIMIT 5 OFFSET 3
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/04-quads.sparql
new file mode 100644
index 00000000..87d5af00
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/limit-offset/04-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
+OFFSET 3
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/01-quads.sparql
new file mode 100644
index 00000000..88d95d1c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/01-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?x ?z WHERE {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?x .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  _:g_0 <http://example.org/ns#p> ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/02-quads.sparql
new file mode 100644
index 00000000..d18a8bd7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/02-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?x ?z WHERE {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?z .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  ?x <http://example.org/ns#p> _:g_0 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/03-quads.sparql
new file mode 100644
index 00000000..bf76f3af
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/03-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?z WHERE {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?z .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/04-quads.sparql
new file mode 100644
index 00000000..ebabbbc4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/04-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?z WHERE {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?z .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:g_0 .
+  _:g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/05-quads.sparql
new file mode 100644
index 00000000..c462fb9f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lists/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT * WHERE {
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  _:g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/01-quads.sparql
new file mode 100644
index 00000000..d55f7df9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/01-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/02-quads.sparql
new file mode 100644
index 00000000..d55f7df9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/02-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/03-quads.sparql
new file mode 100644
index 00000000..f8e69d2e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/03-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x\"y'z"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/04-quads.sparql
new file mode 100644
index 00000000..f8e69d2e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/04-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x\"y'z"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/05-quads.sparql
new file mode 100644
index 00000000..5fbc9899
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/05-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x\""^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/06-quads.sparql
new file mode 100644
index 00000000..b54a89ce
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/06-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x'"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/07-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/07-quads.sparql
new file mode 100644
index 00000000..90a70666
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/07-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "123"^^<http://www.w3.org/2001/XMLSchema#integer> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/08-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/08-quads.sparql
new file mode 100644
index 00000000..90a70666
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/08-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "123"^^<http://www.w3.org/2001/XMLSchema#integer> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/09-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/09-quads.sparql
new file mode 100644
index 00000000..0b142e30
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/09-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\n\"\"\nLiteral\n"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/10-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/10-quads.sparql
new file mode 100644
index 00000000..1c36cd23
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/10-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\n'' \"\"\"\nLiteral\n"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/11-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/11-quads.sparql
new file mode 100644
index 00000000..0c2b58d5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/11-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\"\"\"Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/12-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/12-quads.sparql
new file mode 100644
index 00000000..c5b2fefb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/12-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long'''Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/13-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/13-quads.sparql
new file mode 100644
index 00000000..0c2b58d5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/13-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\"\"\"Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/14-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/14-quads.sparql
new file mode 100644
index 00000000..c5b2fefb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/14-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long'''Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/15-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/15-quads.sparql
new file mode 100644
index 00000000..ecaa4886
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/15-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long '' Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/16-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/16-quads.sparql
new file mode 100644
index 00000000..4def5fef
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/16-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long ' Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/17-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/17-quads.sparql
new file mode 100644
index 00000000..613d210d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/17-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long''\\Literal with '\\ single quotes "^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/18-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/18-quads.sparql
new file mode 100644
index 00000000..64b6b5d9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/18-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long \"\" Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/19-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/19-quads.sparql
new file mode 100644
index 00000000..c83c8d11
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/19-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long \" Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/20-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/20-quads.sparql
new file mode 100644
index 00000000..1b9796a9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/lit/20-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\"\"\\Literal with \"\\ single quotes"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/opt-filter/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/opt-filter/01-quads.sparql
new file mode 100644
index 00000000..db53fb56
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/opt-filter/01-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?v ?w ?x ?y WHERE {
+  ?x <http://example/p> ?v .
+  OPTIONAL {
+    ?y <http://example/q> ?w .
+    FILTER ( ( ?v = "2"^^<http://www.w3.org/2001/XMLSchema#integer> ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/opt-filter/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/opt-filter/02-quads.sparql
new file mode 100644
index 00000000..9055e1ca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/opt-filter/02-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?v ?w ?x ?y WHERE {
+  ?x <http://example/p> ?v .
+  OPTIONAL {
+    ?y <http://example/q> ?w .
+    FILTER ( ( ( ?v = "2"^^<http://www.w3.org/2001/XMLSchema#integer> ) && ( ?w = "3"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/01-quads.sparql
new file mode 100644
index 00000000..acad388d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/02-quads.sparql
new file mode 100644
index 00000000..61af29dc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/02-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ( ?o + "5"^^<http://www.w3.org/2001/XMLSchema#integer> ) )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/03-quads.sparql
new file mode 100644
index 00000000..acad388d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/03-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/04-quads.sparql
new file mode 100644
index 00000000..1d38f219
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/04-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY DESC ( ?o )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/05-quads.sparql
new file mode 100644
index 00000000..8b1154f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY DESC ( <http://example.org/ns#func> ( ?s , ?o ) )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/06-quads.sparql
new file mode 100644
index 00000000..6b136c4a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/06-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY DESC ( ( ?o + "57"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) ASC ( <http://example.org/ns#func2> ( ?o ) ) ASC ( ?s )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/07-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/07-quads.sparql
new file mode 100644
index 00000000..6b07b084
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/order/07-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( STR( ?o ) )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/01-quads.sparql
new file mode 100644
index 00000000..81fe9632
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/01-quads.sparql
@@ -0,0 +1,2 @@
+SELECT * WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/02-quads.sparql
new file mode 100644
index 00000000..97298f7d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/02-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?a ?y ?z WHERE {
+  ?a <http://example.org/ns#b> <http://example.org/ns#c> .
+  OPTIONAL {
+    <http://example.org/ns#x> <http://example.org/ns#y> <http://example.org/ns#z> .
+  }
+  <http://example.org/ns#x> ?y ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/03-quads.sparql
new file mode 100644
index 00000000..55fd3bcd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/pat/03-quads.sparql
@@ -0,0 +1,12 @@
+SELECT ?a WHERE {
+  OPTIONAL {
+    <http://example.org/ns#x> <http://example.org/ns#y> <http://example.org/ns#z> .
+  }
+  ?a <http://example.org/ns#b> <http://example.org/ns#c> .
+  {
+    <http://example.org/ns#x1> <http://example.org/ns#y1> <http://example.org/ns#z1> .
+  }
+  UNION {
+    <http://example.org/ns#x2> <http://example.org/ns#y2> <http://example.org/ns#z2> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/reduced/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/reduced/01-quads.sparql
new file mode 100644
index 00000000..a6282993
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/reduced/01-quads.sparql
@@ -0,0 +1,3 @@
+SELECT REDUCED ?x ?y ?z WHERE {
+  ?x ?y ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/01-quads.sparql
new file mode 100644
index 00000000..67042389
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT * WHERE {
+  OPTIONAL {
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/02-quads.sparql
new file mode 100644
index 00000000..d8de8eec
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/02-quads.sparql
@@ -0,0 +1,5 @@
+SELECT * WHERE {
+  OPTIONAL {
+    <http://example.org/ns#a> <http://example.org/ns#b> <http://example.org/ns#c> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/13-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/13-quads.sparql
new file mode 100644
index 00000000..8ef2d34a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/dawg-syntax/struct/13-quads.sparql
@@ -0,0 +1,10 @@
+SELECT * WHERE {
+  <http://example.org/ns#p> <http://example.org/ns#q> <http://example.org/ns#r> .
+  OPTIONAL {
+    <http://example.org/ns#a> <http://example.org/ns#b> <http://example.org/ns#c> .
+  }
+  <http://example.org/ns#p> <http://example.org/ns#q> <http://example.org/ns#r> .
+  OPTIONAL {
+    <http://example.org/ns#a> <http://example.org/ns#b> <http://example.org/ns#c> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/agg-empty-group-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/agg-empty-group-quads.sparql
new file mode 100644
index 00000000..f75e34da
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/agg-empty-group-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?x ( MAX( ?value ) AS ?max ) WHERE {
+  ?x <http://example.com/p> ?value .
+}
+GROUP BY ?x
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/avg-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/avg-quads.sparql
new file mode 100644
index 00000000..6fcfd8c9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/avg-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ( AVG( ?o ) AS ?avg ) WHERE {
+  ?s <http://www.example.org/dec> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/avg-with-group-by-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/avg-with-group-by-quads.sparql
new file mode 100644
index 00000000..5c14a29a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/avg-with-group-by-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?s ( AVG( ?o ) AS ?avg ) WHERE {
+  ?s ?p ?o .
+}
+GROUP BY ?s
+HAVING ( AVG( ?o ) <= "2.0"^^<http://www.w3.org/2001/XMLSchema#decimal> )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/count-3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/count-3-quads.sparql
new file mode 100644
index 00000000..382ce20b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/count-3-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?P ( COUNT( ?O ) AS ?C ) WHERE {
+  ?S ?P ?O .
+}
+GROUP BY ?P
+HAVING ( COUNT( ?O ) > "2"^^<http://www.w3.org/2001/XMLSchema#integer> )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/count-8b-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/count-8b-quads.sparql
new file mode 100644
index 00000000..097a965c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/count-8b-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?O12 ( COUNT( ?O1 ) AS ?C ) WHERE {
+  ?S <http://www.example.org/p> ?O1 .
+  ?S <http://www.example.org/q> ?O2 .
+  BIND( ( ?O1 + ?O2 ) AS ?O12 )
+}
+GROUP BY ?O12
+ORDER BY ASC ( ?O12 )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/error-in-avg-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/error-in-avg-quads.sparql
new file mode 100644
index 00000000..8f276200
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/error-in-avg-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?g ( AVG( ?p ) AS ?avg ) ( ( ( MIN( ?p ) + MAX( ?p ) ) / "2"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?c ) WHERE {
+  ?g <http://example.com/data/#p> ?p .
+}
+GROUP BY ?g
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-1-quads.sparql
new file mode 100644
index 00000000..60f51627
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-1-quads.sparql
@@ -0,0 +1,8 @@
+ASK WHERE {
+  {
+    SELECT ( GROUP_CONCAT( ?o ;SEPARATOR=" " ) AS ?g ) WHERE {
+      _:g_0 <http://www.example.org/p1> ?o .
+    }
+  }
+  FILTER ( ( ( ?g = "1 22"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "22 1"^^<http://www.w3.org/2001/XMLSchema#string> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-2-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-2-quads.sparql
new file mode 100644
index 00000000..ebeb6fd5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-2-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ( COUNT( * ) AS ?c ) WHERE {
+  {
+    SELECT ?p ( GROUP_CONCAT( ?o ;SEPARATOR=" " ) AS ?g ) WHERE {
+      _:g_0 ?p ?o .
+    }
+    GROUP BY ?p
+  }
+  FILTER ( ( ( ( ?p = <http://www.example.org/p1> ) && ( ( ?g = "1 22"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "22 1"^^<http://www.w3.org/2001/XMLSchema#string> ) ) ) || ( ( ?p = <http://www.example.org/p2> ) && ( ( ( ( ( ( ?g = "aaa bb c"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "aaa c bb"^^<http://www.w3.org/2001/XMLSchema#string> ) ) || ( ?g = "bb aaa c"^^<http://www.w3.org/2001/XMLSchema#string> ) ) || ( ?g = "bb c aaa"^^<http://www.w3.org/2001/XMLSchema#string> ) ) || ( ?g = "c aaa bb"^^<http://www.w3.org/2001/XMLSchema#string> ) ) || ( ?g = "c bb aaa"^^<http://www.w3.org/2001/XMLSchema#string> ) ) ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-with-separator-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-with-separator-quads.sparql
new file mode 100644
index 00000000..d8545b53
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/group-concat-with-separator-quads.sparql
@@ -0,0 +1,8 @@
+ASK WHERE {
+  {
+    SELECT ( GROUP_CONCAT( ?o ;SEPARATOR=":" ) AS ?g ) WHERE {
+      _:g_0 <http://www.example.org/p1> ?o .
+    }
+  }
+  FILTER ( ( ( ?g = "1:22"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "22:1"^^<http://www.w3.org/2001/XMLSchema#string> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/protect-from-error-in-avg-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/protect-from-error-in-avg-quads.sparql
new file mode 100644
index 00000000..1ee5d1f1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/protect-from-error-in-avg-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?g ( AVG( IF( ISNUMERIC( ?p ) , ?p , COALESCE( <http://www.w3.org/2001/XMLSchema#double> ( ?p ) , "0"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) ) AS ?avg ) WHERE {
+  ?g <http://example.com/data/#p> ?p .
+}
+GROUP BY ?g
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/sample-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/sample-quads.sparql
new file mode 100644
index 00000000..60a7538c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/aggregates/sample-quads.sparql
@@ -0,0 +1,8 @@
+ASK WHERE {
+  {
+    SELECT ( SAMPLE( ?o ) AS ?sample ) WHERE {
+      ?s <http://www.example.org/dec> ?o .
+    }
+  }
+  FILTER ( ( ( ( ?sample = "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> ) || ( ?sample = "2.2"^^<http://www.w3.org/2001/XMLSchema#decimal> ) ) || ( ?sample = "3.5"^^<http://www.w3.org/2001/XMLSchema#decimal> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/group-concat-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/group-concat-1-quads.sparql
new file mode 100644
index 00000000..60f51627
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/group-concat-1-quads.sparql
@@ -0,0 +1,8 @@
+ASK WHERE {
+  {
+    SELECT ( GROUP_CONCAT( ?o ;SEPARATOR=" " ) AS ?g ) WHERE {
+      _:g_0 <http://www.example.org/p1> ?o .
+    }
+  }
+  FILTER ( ( ( ?g = "1 22"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "22 1"^^<http://www.w3.org/2001/XMLSchema#string> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/in-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/in-1-quads.sparql
new file mode 100644
index 00000000..59107b98
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/in-1-quads.sparql
@@ -0,0 +1,3 @@
+ASK WHERE {
+  FILTER ( ( "2"^^<http://www.w3.org/2001/XMLSchema#integer> IN ( "1"^^<http://www.w3.org/2001/XMLSchema#integer> , "2"^^<http://www.w3.org/2001/XMLSchema#integer> , "3"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/not-in-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/not-in-1-quads.sparql
new file mode 100644
index 00000000..b042305e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/not-in-1-quads.sparql
@@ -0,0 +1,3 @@
+ASK WHERE {
+  FILTER ( ( "2"^^<http://www.w3.org/2001/XMLSchema#integer> NOT IN ( ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.sparql
new file mode 100644
index 00000000..883c6cfc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.sparql
@@ -0,0 +1,3 @@
+ASK WHERE {
+  _:e_a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/test#Person> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.sparql
new file mode 100644
index 00000000..7fb3cfc4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.sparql
@@ -0,0 +1,6 @@
+ASK WHERE {
+  <http://example.org/test#a> <http://example.org/test#p> _:e_aa .
+  _:e_aa <http://example.org/test#r> _:e_dd .
+  _:e_dd <http://example.org/test#t> _:e_bb .
+  _:e_bb <http://example.org/test#s> <http://example.org/test#a> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/syn-pname-01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/syn-pname-01-quads.sparql
new file mode 100644
index 00000000..fcbeed5d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/ask/syn-pname-01-quads.sparql
@@ -0,0 +1,2 @@
+ASK WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/01-quads.sparql
new file mode 100644
index 00000000..dc685607
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/01-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ( ( ?o + "10"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z ) WHERE {
+  ?s ?p ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/02-quads.sparql
new file mode 100644
index 00000000..a635d356
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/02-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?o ( ( ?o + "10"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z ) ( ( ?o + "100"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z2 ) WHERE {
+  ?s ?p ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/03-quads.sparql
new file mode 100644
index 00000000..4e13bdb6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/03-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?z ?s1 WHERE {
+  {
+    ?s ?p ?o .
+    BIND( ( ?o + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+  ?s1 ?p1 ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/04-quads.sparql
new file mode 100644
index 00000000..7d142d8f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/04-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?o ?p ?s ( ?nova AS ?z ) WHERE {
+  ?s ?p ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/05-quads.sparql
new file mode 100644
index 00000000..804c329b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/05-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?s ?p ?o ?z WHERE {
+  {
+    ?s ?p ?o .
+    BIND( ( ?o + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+  FILTER ( ( ?z = "3"^^<http://www.w3.org/2001/XMLSchema#integer> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/07-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/07-quads.sparql
new file mode 100644
index 00000000..e85b8dac
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/07-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ?s ?p ?o ?z WHERE {
+  ?s ?p ?o .
+  {
+    BIND( ( ?o + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+  UNION {
+    BIND( ( ?o + "2"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/08-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/08-quads.sparql
new file mode 100644
index 00000000..804c329b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/08-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?s ?p ?o ?z WHERE {
+  {
+    ?s ?p ?o .
+    BIND( ( ?o + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+  FILTER ( ( ?z = "3"^^<http://www.w3.org/2001/XMLSchema#integer> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/10-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/10-quads.sparql
new file mode 100644
index 00000000..19faf777
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/10-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ?s ?v ?z WHERE {
+  {
+    BIND( "4"^^<http://www.w3.org/2001/XMLSchema#integer> AS ?z )
+  }
+  {
+    ?s <http://example.org/p> ?v .
+    FILTER ( ( ?v = ?z ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/11-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/11-quads.sparql
new file mode 100644
index 00000000..c5b4e7bf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/bind/11-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?s ?v ?z WHERE {
+  {
+    BIND( "4"^^<http://www.w3.org/2001/XMLSchema#integer> AS ?z )
+  }
+  ?s <http://example.org/p> ?v .
+  FILTER ( ( ?v = ?z ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/construct-from-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/construct-from-quads.sparql
new file mode 100644
index 00000000..13f2991b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/construct-from-quads.sparql
@@ -0,0 +1,7 @@
+CONSTRUCT {
+  ?s ?p ?o .
+}
+FROM <http://example.com/data> WHERE {
+  ?s ?p ?o .
+}
+LIMIT 100
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/construct-slice-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/construct-slice-quads.sparql
new file mode 100644
index 00000000..0137b4ca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/construct-slice-quads.sparql
@@ -0,0 +1,7 @@
+CONSTRUCT {
+  ?s ?p ?o .
+}
+WHERE {
+  ?s ?p ?o .
+}
+LIMIT 100
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere01-quads.sparql
new file mode 100644
index 00000000..c20b63c8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere01-quads.sparql
@@ -0,0 +1,6 @@
+CONSTRUCT {
+  ?s ?p ?o .
+}
+WHERE {
+  ?s ?p ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere02-quads.sparql
new file mode 100644
index 00000000..380ea468
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere02-quads.sparql
@@ -0,0 +1,8 @@
+CONSTRUCT {
+  <http://example.org/s1> <http://example.org/p> ?o .
+  ?s2 <http://example.org/p> ?o .
+}
+WHERE {
+  <http://example.org/s1> <http://example.org/p> ?o .
+  ?s2 <http://example.org/p> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere03-quads.sparql
new file mode 100644
index 00000000..204f4d2f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere03-quads.sparql
@@ -0,0 +1,8 @@
+CONSTRUCT {
+  <http://example.org/s2> <http://example.org/p> ?o1 .
+  <http://example.org/s2> <http://example.org/p> ?o2 .
+}
+WHERE {
+  <http://example.org/s2> <http://example.org/p> ?o1 .
+  <http://example.org/s2> <http://example.org/p> ?o2 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere05-modified-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere05-modified-quads.sparql
new file mode 100644
index 00000000..5937d55c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere05-modified-quads.sparql
@@ -0,0 +1,9 @@
+CONSTRUCT {
+  ?s ?p ?o .
+}
+WHERE {
+  {
+    ?s ?p ?o .
+    FILTER ( ( ?o = <http://example.org/o1> ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere06-quads.sparql
new file mode 100644
index 00000000..bed446cb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/construct/constructwhere06-quads.sparql
@@ -0,0 +1,6 @@
+CONSTRUCT {
+  _:e_s_b ?p _:e_o_b .
+}
+WHERE {
+  _:e_s_b ?p _:e_o_b .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.sparql
new file mode 100644
index 00000000..04cb6b00
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.sparql
@@ -0,0 +1,13 @@
+SELECT ?p ?s WHERE {
+  ?s ?p <http://www.example.org/o> .
+  FILTER ( EXISTS {
+    {
+      ?s ?p <http://www.example.org/o1> .
+      FILTER ( NOT EXISTS {
+        ?s ?p <http://www.example.org/o2> .
+      }
+      )
+    }
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/exists/nested-positive-exists-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/exists/nested-positive-exists-quads.sparql
new file mode 100644
index 00000000..40df757e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/exists/nested-positive-exists-quads.sparql
@@ -0,0 +1,13 @@
+SELECT ?p ?s WHERE {
+  ?s ?p <http://www.example.org/o> .
+  FILTER ( EXISTS {
+    {
+      ?s ?p <http://www.example.org/o1> .
+      FILTER ( EXISTS {
+        ?s ?p <http://www.example.org/o2> .
+      }
+      )
+    }
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/bnode-str-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/bnode-str-quads.sparql
new file mode 100644
index 00000000..93fef861
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/bnode-str-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?s1 ?s2 ( BNODE( ?s1 ) AS ?b1 ) ( BNODE( ?s2 ) AS ?b2 ) WHERE {
+  ?a <http://example.org/str> ?s1 .
+  ?b <http://example.org/str> ?s2 .
+  FILTER ( ( ( ( ?a = <http://example.org/s1> ) || ( ?a = <http://example.org/s3> ) ) && ( ( ?b = <http://example.org/s1> ) || ( ?b = <http://example.org/s3> ) ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/now-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/now-quads.sparql
new file mode 100644
index 00000000..5de81b1c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/now-quads.sparql
@@ -0,0 +1,6 @@
+ASK WHERE {
+  {
+    BIND( NOW( ) AS ?n )
+  }
+  FILTER ( ( DATATYPE( ?n ) = <http://www.w3.org/2001/XMLSchema#dateTime> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/strlang-str-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/strlang-str-quads.sparql
new file mode 100644
index 00000000..fe40fbd8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/functions/strlang-str-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?s ( STRLANG( STR( ?str ) , "en-US"^^<http://www.w3.org/2001/XMLSchema#string> ) AS ?s2 ) WHERE {
+  ?s <http://example.org/str> ?str .
+  FILTER ( LANGMATCHES( LANG( ?str ) , "en"^^<http://www.w3.org/2001/XMLSchema#string> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/01-quads.sparql
new file mode 100644
index 00000000..5ed3e159
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?s WHERE {
+  ?s <http://example/p> ?v .
+}
+GROUP BY ?s
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/03-quads.sparql
new file mode 100644
index 00000000..20b7e088
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/03-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?w ( SAMPLE( ?v ) AS ?S ) WHERE {
+  ?s <http://example/p> ?v .
+  OPTIONAL {
+    ?s <http://example/q> ?w .
+  }
+}
+GROUP BY ?w
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/04-quads.sparql
new file mode 100644
index 00000000..98e29058
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/group/04-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?X ( SAMPLE( ?v ) AS ?S ) WHERE {
+  ?s <http://example/p> ?v .
+  OPTIONAL {
+    ?s <http://example/q> ?w .
+  }
+  BIND( COALESCE( ?w , "1605-11-05"^^<http://www.w3.org/2001/XMLSchema#date> ) AS ?X )
+}
+GROUP BY ?X
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.sparql
new file mode 100644
index 00000000..7e032caf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.sparql
@@ -0,0 +1,27 @@
+SELECT DISTINCT ?s1 ?s2 WHERE {
+  ?s2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+  ?s1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+  MINUS {
+    {
+      ?s1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+      ?s2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+      ?s1 <http://example/member> ?x .
+      FILTER ( NOT EXISTS {
+        ?s2 <http://example/member> ?x .
+      }
+      )
+    }
+  }
+  MINUS {
+    {
+      ?s1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+      ?s2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+      ?s2 <http://example/member> ?x .
+      FILTER ( NOT EXISTS {
+        ?s1 <http://example/member> ?x .
+      }
+      )
+    }
+  }
+  FILTER ( ( STR( ?s1 ) < STR( ?s2 ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.sparql
new file mode 100644
index 00000000..525c407b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.sparql
@@ -0,0 +1,13 @@
+SELECT ?exam ?date WHERE {
+  ?exam <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#PhysicalExamination> .
+  ?exam <http://purl.org/dc/elements/1.1/date> ?date .
+  ?exam <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#precedes> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#operation1> .
+  ?op <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#SurgicalProcedure> .
+  ?op <http://purl.org/dc/elements/1.1/date> ?opDT .
+  FILTER ( NOT EXISTS {
+    ?otherExam <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#PhysicalExamination> .
+    ?otherExam <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#follows> ?exam .
+    ?otherExam <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#precedes> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#operation1> .
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/simple-minus-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/simple-minus-quads.sparql
new file mode 100644
index 00000000..0937a3ea
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/simple-minus-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?prefLabel ?uri WHERE {
+  ?uri <http://www.w3.org/2004/02/skos/core#prefLabel> ?prefLabel .
+  MINUS {
+    ?uri <http://www.w3.org/2004/02/skos/core#broader> <https://test.com/> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.sparql
new file mode 100644
index 00000000..90e6a517
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.sparql
@@ -0,0 +1,14 @@
+SELECT ?a ?b ?c WHERE {
+  ?a <http://example/p1> ?b .
+  ?a <http://example/p2> ?c .
+  MINUS {
+    ?d <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Sub> .
+    OPTIONAL {
+      ?d <http://example/q1> ?b .
+    }
+    OPTIONAL {
+      ?d <http://example/q2> ?c .
+    }
+  }
+}
+ORDER BY ASC ( ?a )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.sparql
new file mode 100644
index 00000000..0f6158e1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.sparql
@@ -0,0 +1,19 @@
+SELECT ?a ?b ?c WHERE {
+  ?a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Min> .
+  OPTIONAL {
+    ?a <http://example/p1> ?b .
+  }
+  OPTIONAL {
+    ?a <http://example/p2> ?c .
+  }
+  MINUS {
+    ?d <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Sub> .
+    OPTIONAL {
+      ?d <http://example/q1> ?b .
+    }
+    OPTIONAL {
+      ?d <http://example/q2> ?c .
+    }
+  }
+}
+ORDER BY ASC ( ?a )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/01-simple-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/01-simple-path-quads.sparql
new file mode 100644
index 00000000..40657b2e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/01-simple-path-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> <http://www.example.org/schema#p1> ?var0 .
+  ?var0 <http://www.example.org/schema#p2> ?var1 .
+  ?var1 <http://www.example.org/schema#p3> ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/02-star-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/02-star-path-quads.sparql
new file mode 100644
index 00000000..c4210e8b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/02-star-path-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> ((<http://www.example.org/schema#p1>/<http://www.example.org/schema#p2>/<http://www.example.org/schema#p3>)*) ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/08-reverse-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/08-reverse-path-quads.sparql
new file mode 100644
index 00000000..b0742433
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/08-reverse-path-quads.sparql
@@ -0,0 +1,3 @@
+ASK WHERE {
+  <http://www.example.org/instance#a> <http://www.example.org/schema#p> <http://www.example.org/instance#b> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/09-reverse-sequence-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/09-reverse-sequence-path-quads.sparql
new file mode 100644
index 00000000..2d6ae0a9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/09-reverse-sequence-path-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?x WHERE {
+  ?x <http://www.example.org/schema#p1> ?var0 .
+  ?var0 <http://www.example.org/schema#p2> <http://www.example.org/instance#c> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/10-path-with-negation-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/10-path-with-negation-quads.sparql
new file mode 100644
index 00000000..95523b3f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/10-path-with-negation-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> (!(<http://www.example.org/schema#p1>|<http://www.example.org/schema#p2>)) ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.sparql
new file mode 100644
index 00000000..2e2dbf88
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> ((<http://www.example.org/schema#p1>/<http://www.example.org/schema#p2>)+) ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/14-star-path-over-foaf-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/14-star-path-over-foaf-quads.sparql
new file mode 100644
index 00000000..18ee386f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/14-star-path-over-foaf-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?X ?Y WHERE {
+  ?X (<http://xmlns.com/foaf/0.1/knows>*) ?Y .
+}
+ORDER BY ASC ( ?X ) ASC ( ?Y )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/14-star-path-over-foafknows-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/14-star-path-over-foafknows-quads.sparql
new file mode 100644
index 00000000..18ee386f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/14-star-path-over-foafknows-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?X ?Y WHERE {
+  ?X (<http://xmlns.com/foaf/0.1/knows>*) ?Y .
+}
+ORDER BY ASC ( ?X ) ASC ( ?Y )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/28a-diamond-with-loop-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/28a-diamond-with-loop-quads.sparql
new file mode 100644
index 00000000..65a624b5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/28a-diamond-with-loop-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?t WHERE {
+  <http://example/a> ((<http://example/p>/<http://example/p>)?) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/30-operator-precedence-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/30-operator-precedence-1-quads.sparql
new file mode 100644
index 00000000..4fbc59a0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/30-operator-precedence-1-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?t WHERE {
+  <http://www.example.org/a> (<http://www.example.org/p1>|(<http://www.example.org/p2>/<http://www.example.org/p3>)|<http://www.example.org/p4>) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/31-operator-precedence-2-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/31-operator-precedence-2-quads.sparql
new file mode 100644
index 00000000..e2850fb3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/31-operator-precedence-2-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?t WHERE {
+  <http://www.example.org/a> (<http://www.example.org/p1>|<http://www.example.org/p2>) ?var0 .
+  ?var0 (<http://www.example.org/p3>|<http://www.example.org/p4>) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/32-operator-precedence-3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/32-operator-precedence-3-quads.sparql
new file mode 100644
index 00000000..05f52b6a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/32-operator-precedence-3-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?t WHERE {
+  <http://www.example.org/a> (<http://www.example.org/p0>|((^<http://www.example.org/p1>)/<http://www.example.org/p2>)|<http://www.example.org/p3>) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/33-operator-precedence-4-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/33-operator-precedence-4-quads.sparql
new file mode 100644
index 00000000..637fa8cd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/33-operator-precedence-4-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?t WHERE {
+  <http://www.example.org/a> (((<http://www.example.org/p0>|(^<http://www.example.org/p1>))/<http://www.example.org/p2>)|<http://www.example.org/p3>) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/37-nested-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/37-nested-quads.sparql
new file mode 100644
index 00000000..e28e896a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/37-nested-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?X WHERE {
+  <http://example.org/A0> ((<http://example.org/P>*)*) ?X .
+}
+ORDER BY ASC ( ?X )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/path-union-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/path-union-quads.sparql
new file mode 100644
index 00000000..890edc01
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/paths/path-union-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ?instanceOf ?item WHERE {
+  {
+    ?item <http://www.wikidata.org/prop/direct/P31> <http://www.wikidata.org/entity/Q486972> .
+  }
+  UNION {
+    ?item <http://www.wikidata.org/prop/direct/P31> ?instanceOf .
+    ?instanceOf (<http://www.wikidata.org/prop/direct/P279>+) <http://www.wikidata.org/entity/Q486972> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service01-quads.sparql
new file mode 100644
index 00000000..d7973505
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service01-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  SERVICE <http://example.org/sparql> {
+    ?s ?p2 ?o2 .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service02-quads.sparql
new file mode 100644
index 00000000..7c326c04
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service02-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  SERVICE <http://example1.org/sparql> {
+    ?s ?p ?o1 .
+  }
+  OPTIONAL {
+    SERVICE <http://example2.org/sparql> {
+      ?s ?p2 ?o2 .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service03-quads.sparql
new file mode 100644
index 00000000..9dff1348
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service03-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  SERVICE <http://example1.org/sparql> {
+    ?s ?p ?o1 .
+    OPTIONAL {
+      SERVICE <http://example2.org/sparql> {
+        ?s ?p2 ?o2 .
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service04-quads.sparql
new file mode 100644
index 00000000..3a4c48da
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service04-quads.sparql
@@ -0,0 +1,11 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  OPTIONAL {
+    SERVICE <http://example.org/sparql> {
+      ?s <http://xmlns.com/foaf/0.1/knows> ?o2 .
+    }
+  }
+  VALUES ?o2 {
+    <http://example.org/b>
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service05-quads.sparql
new file mode 100644
index 00000000..f61998e6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service05-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?service ?title WHERE {
+  {
+    ?p <http://purl.org/dc/elements/1.1/subject> ?projectSubject .
+    ?p <http://rdfs.org/ns/void#sparqlEndpoint> ?service .
+    FILTER ( REGEX( ?projectSubject , "remote"^^<http://www.w3.org/2001/XMLSchema#string> ) )
+  }
+  SERVICE ?service {
+    ?project <http://usefulinc.com/ns/doap#name> ?title .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service06-quads.sparql
new file mode 100644
index 00000000..a60aa5c9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service06-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  SERVICE <http://example1.org/sparql> {
+    ?s ?p ?o1 .
+    OPTIONAL {
+      SERVICE SILENT <http://invalid.endpoint.org/sparql> {
+        ?s ?p2 ?o2 .
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service07-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service07-quads.sparql
new file mode 100644
index 00000000..a8162f06
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/service/service07-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p ?o1 .
+  SERVICE SILENT <http://invalid.endpoint.org/sparql> {
+    ?s ?p2 ?o2 .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/06-subquery-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/06-subquery-quads.sparql
new file mode 100644
index 00000000..93e325fb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/06-subquery-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?x WHERE {
+  SELECT ?p ?x ?y WHERE {
+    ?x ?p ?y .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.sparql
new file mode 100644
index 00000000..e9a25563
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?x ?max WHERE {
+  {
+    SELECT ( MAX( ?y ) AS ?max ) WHERE {
+      ?x <http://www.example.org/schema#p> ?y .
+    }
+  }
+  ?x <http://www.example.org/schema#p> ?max .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/09-nested-subqueries-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/09-nested-subqueries-quads.sparql
new file mode 100644
index 00000000..7a4d3652
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/09-nested-subqueries-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?x ?y WHERE {
+  {
+    SELECT ?x WHERE {
+      SELECT ?x WHERE {
+        ?x <http://www.example.org/schema#q> ?t .
+      }
+    }
+  }
+  ?x <http://www.example.org/schema#p> ?y .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.sparql
new file mode 100644
index 00000000..7a7c8adc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.sparql
@@ -0,0 +1,12 @@
+SELECT ?L WHERE {
+  _:g_0 <http://www.w3.org/2000/01/rdf-schema#label> ?L .
+  ?O <http://www.example.orghasItem> _:g_0 .
+  {
+    SELECT DISTINCT ?O WHERE {
+      ?O <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.example.orgOrder> .
+    }
+    ORDER BY ASC ( ?O )
+    LIMIT 2
+  }
+}
+ORDER BY ASC ( ?L )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/aggregate-15-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/aggregate-15-quads.sparql
new file mode 100644
index 00000000..5022e0a8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/aggregate-15-quads.sparql
@@ -0,0 +1,2 @@
+SELECT ( GROUP_CONCAT( ?x ;SEPARATOR=";" ) AS ?y ) WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/bindscope1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/bindscope1-quads.sparql
new file mode 100644
index 00000000..ac58082e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/bindscope1-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?o ?o1 WHERE {
+  {
+    <http://www.example.orgs> <http://www.example.orgp> ?o .
+    BIND( ( "1"^^<http://www.w3.org/2001/XMLSchema#integer> + ?o ) AS ?o1 )
+  }
+  <http://www.example.orgs> <http://www.example.orgq> ?o1 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-oneof-01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-oneof-01-quads.sparql
new file mode 100644
index 00000000..cba91fa5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-oneof-01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( ( ?o NOT IN ( "1"^^<http://www.w3.org/2001/XMLSchema#integer> , "2"^^<http://www.w3.org/2001/XMLSchema#integer> , ( ?s + "57"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-oneof-03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-oneof-03-quads.sparql
new file mode 100644
index 00000000..966db835
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-oneof-03-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( ( ?o IN ( "1"^^<http://www.w3.org/2001/XMLSchema#integer> , <x:x> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-subquery-02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-subquery-02-quads.sparql
new file mode 100644
index 00000000..15dea7dd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/syntax/syntax-subquery-02-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  SELECT ?o ?p ?s WHERE {
+    ?s ?p ?o .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/01-bind-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/01-bind-quads.sparql
new file mode 100644
index 00000000..12c070a2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/01-bind-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?book ?title ?price WHERE {
+  VALUES ?book {
+    <http://example.org/book/book1>
+  }
+  ?book <http://purl.org/dc/elements/1.1/title> ?title .
+  ?book <http://example.org/ns#price> ?price .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.sparql
new file mode 100644
index 00000000..2317c33a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  ?s ?p2 ?o2 .
+  VALUES( ?o1 ?o2 ){
+    ( "Alan"^^<http://www.w3.org/2001/XMLSchema#string> UNDEF )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.sparql
new file mode 100644
index 00000000..be3200ee
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  ?s ?p2 ?o2 .
+  VALUES( ?o1 ?o2 ){
+    ( UNDEF "Alan"^^<http://www.w3.org/2001/XMLSchema#string> )
+    ( <http://example.org/b> UNDEF )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.sparql
new file mode 100644
index 00000000..b4cab995
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  OPTIONAL {
+    ?s <http://xmlns.com/foaf/0.1/knows> ?o2 .
+  }
+  VALUES ?o2 {
+    <http://example.org/b>
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.sparql
new file mode 100644
index 00000000..4bc29135
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?book ?title ?price WHERE {
+  ?book <http://purl.org/dc/elements/1.1/title> ?title .
+  ?book <http://example.org/ns#price> ?price .
+  VALUES ?book {
+    <http://example.org/book/book1>
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-subquery-values-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-subquery-values-quads.sparql
new file mode 100644
index 00000000..fff5e666
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/post-subquery-values-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?s ?o WHERE {
+  SELECT ?o ?p ?s WHERE {
+    ?s ?p ?o .
+    VALUES ?o {
+      <http://example.org/b>
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/values-many-once-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/values-many-once-quads.sparql
new file mode 100644
index 00000000..d1d292f1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/values/values-many-once-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?y ?z WHERE {
+  VALUES( ?y ?z ){
+    ( <http://example.com/ns#a><http://example.com/ns#b> )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.1-quads.sparql
new file mode 100644
index 00000000..9310fa7d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.1-quads.sparql
@@ -0,0 +1,2 @@
+DESCRIBE <http://example.org/> WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.2a-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.2a-quads.sparql
new file mode 100644
index 00000000..247bd5bf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.2a-quads.sparql
@@ -0,0 +1,3 @@
+DESCRIBE ?x WHERE {
+  ?x <http://xmlns.com/foaf/0.1/mbox> <mailto:alice@org> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.2c-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.2c-quads.sparql
new file mode 100644
index 00000000..dbc7de56
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/16.4.2c-quads.sparql
@@ -0,0 +1,3 @@
+DESCRIBE ?x?y<http://example.org/> WHERE {
+  ?x <http://xmlns.com/foaf/0.1/knows> ?y .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/star-empty-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/star-empty-quads.sparql
new file mode 100644
index 00000000..6576f231
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/star-empty-quads.sparql
@@ -0,0 +1,2 @@
+DESCRIBE * WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/star-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/star-quads.sparql
new file mode 100644
index 00000000..d19a63b5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/describe/star-quads.sparql
@@ -0,0 +1,3 @@
+DESCRIBE ?x?y WHERE {
+  ?x <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?y .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/empty-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/empty-quads.sparql
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/existence-subquery-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/existence-subquery-quads.sparql
new file mode 100644
index 00000000..cfee9662
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/existence-subquery-quads.sparql
@@ -0,0 +1,12 @@
+SELECT ?s ?p ?o WHERE {
+  ?a <https://mydom2#predB> ?b .
+  FILTER ( EXISTS {
+    ?var0 <https://mydom2#predN> ?q .
+    {
+      SELECT ( ?_s AS ?q2 ) ( ?_o AS ?var0 ) WHERE {
+        ?_s ?p ?_o .
+      }
+    }
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/filter-union-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/filter-union-quads.sparql
new file mode 100644
index 00000000..87ee0d24
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/filter-union-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?this WHERE {
+  {
+    FILTER ( "false"^^<http://www.w3.org/2001/XMLSchema#boolean> )
+  }
+  UNION {
+    FILTER ( ( ?this = <http://example.org/InvalidResource> ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.1-quads.sparql
new file mode 100644
index 00000000..32450449
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.1-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?name FROM <http://example.org/foaf/aliceFoaf> WHERE {
+  ?x <http://xmlns.com/foaf/0.1/name> ?name .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.2-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.2-quads.sparql
new file mode 100644
index 00000000..c0aed975
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.2-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?name FROM NAMED <http://example.org/alice> FROM NAMED <http://example.org/bob> WHERE {
+  ?x <http://xmlns.com/foaf/0.1/name> ?name .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.3-quads.sparql
new file mode 100644
index 00000000..5dff0fa9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.2.3-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?who ?g ?mbox FROM <http://example.org/dft.ttl> FROM NAMED <http://example.org/alice> FROM NAMED <http://example.org/bob> WHERE {
+  ?g <http://purl.org/dc/elements/1.1/publisher> ?who .
+  GRAPH ?g {
+    ?x <http://xmlns.com/foaf/0.1/mbox> ?mbox .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.1-quads.sparql
new file mode 100644
index 00000000..a2a8f3c3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.1-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?src ?bobNick FROM NAMED <http://example.org/foaf/aliceFoaf> FROM NAMED <http://example.org/foaf/bobFoaf> WHERE {
+  GRAPH ?src {
+    ?x <http://xmlns.com/foaf/0.1/mbox> <mailto:bob@work.example> .
+    ?x <http://xmlns.com/foaf/0.1/nick> ?bobNick .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.2-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.2-quads.sparql
new file mode 100644
index 00000000..6941318b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.2-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?nick FROM NAMED <http://example.org/foaf/aliceFoaf> FROM NAMED <http://example.org/foaf/bobFoaf> WHERE {
+  GRAPH <http://example.org/foaf/bobFoaf> {
+    ?x <http://xmlns.com/foaf/0.1/mbox> <mailto:bob@work.example> .
+    ?x <http://xmlns.com/foaf/0.1/nick> ?nick .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.3-quads.sparql
new file mode 100644
index 00000000..98667bae
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.3-quads.sparql
@@ -0,0 +1,13 @@
+SELECT ?mbox ?nick ?ppd FROM NAMED <http://example.org/foaf/aliceFoaf> FROM NAMED <http://example.org/foaf/bobFoaf> WHERE {
+  GRAPH <http://example.org/foaf/aliceFoaf> {
+    ?alice <http://xmlns.com/foaf/0.1/mbox> <mailto:alice@work.example> .
+    ?alice <http://xmlns.com/foaf/0.1/knows> ?whom .
+    ?whom <http://xmlns.com/foaf/0.1/mbox> ?mbox .
+    ?whom <http://www.w3.org/2000/01/rdf-schema#seeAlso> ?ppd .
+    ?ppd <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/PersonalProfileDocument> .
+  }
+  GRAPH ?ppd {
+    ?w <http://xmlns.com/foaf/0.1/mbox> ?mbox .
+    ?w <http://xmlns.com/foaf/0.1/nick> ?nick .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.4-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.4-quads.sparql
new file mode 100644
index 00000000..e5bab0fa
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/from/13.3.4-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?name ?mbox ?date WHERE {
+  ?g <http://purl.org/dc/elements/1.1/publisher> ?name .
+  ?g <http://purl.org/dc/elements/1.1/date> ?date .
+  GRAPH ?g {
+    ?person <http://xmlns.com/foaf/0.1/name> ?name .
+    ?person <http://xmlns.com/foaf/0.1/mbox> ?mbox .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/group-by-no-var-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/group-by-no-var-quads.sparql
new file mode 100644
index 00000000..df04e2b6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/group-by-no-var-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ( MAX( ?y ) AS ?yy ) WHERE {
+  ?x ?y ?z .
+  BIND( STR( ?x ) AS ?var1 )
+}
+GROUP BY ?var1
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/negate-and-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/negate-and-quads.sparql
new file mode 100644
index 00000000..cdadbccc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/negate-and-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?c WHERE {
+  ?c <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
+  FILTER ( ! ( BOUND( ?c ) && REGEX( STR( ?c ) , "^toto"^^<http://www.w3.org/2001/XMLSchema#string> , "i"^^<http://www.w3.org/2001/XMLSchema#string> ) ) )
+}
+LIMIT 10
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/negated-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/negated-path-quads.sparql
new file mode 100644
index 00000000..fd8707a1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/negated-path-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o WHERE {
+  <http://dbpedia.org/resource/12_Monkeys> (!(<http://dbpedia.org/ontology/starring>)) ?o .
+}
+LIMIT 100
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/nested-union-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/nested-union-quads.sparql
new file mode 100644
index 00000000..8f0c894d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/nested-union-quads.sparql
@@ -0,0 +1,20 @@
+SELECT ?label ?Label ?pLabel ?s WHERE {
+  {
+    ?s <http://xlabelA> ?pLabel .
+    {
+      ?s <http://xlabelC> ?Label .
+    }
+    UNION {
+      ?s <http://xlabelD> ?label .
+    }
+  }
+  UNION {
+    ?s <http://xlabelB> ?pLabel .
+    {
+      ?s <http://xlabelC> ?Label .
+    }
+    UNION {
+      ?s <http://xlabelD> ?label .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/path-inverse-negation-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/path-inverse-negation-quads.sparql
new file mode 100644
index 00000000..2cd1c46a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/path-inverse-negation-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> (!(<http://www.example.org/schema#p1>|^<http://www.example.org/schema#p2>)) ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/project-filter-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/project-filter-quads.sparql
new file mode 100644
index 00000000..a4eb0b3d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/project-filter-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?n ?x WHERE {
+  ?x <http://example.com/p> ?n .
+  FILTER ( NOT EXISTS {
+    {
+      ?x <http://example.com/q> ?m .
+      FILTER ( ( ?n = ?m ) )
+    }
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/unused-extend-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/unused-extend-quads.sparql
new file mode 100644
index 00000000..8f0c2e3a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/unused-extend-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ( ?duration AS ?d ) WHERE {
+  ?a <http://mydom#startTime> ?st .
+  ?a <http://mydom#endTime> ?et .
+  BIND( ( ?et - ?st ) AS ?duration )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/clear-drop-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/clear-drop-quads.sparql
new file mode 100644
index 00000000..abc77c23
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/clear-drop-quads.sparql
@@ -0,0 +1,12 @@
+CREATE SILENT GRAPH <ex:graph>;
+CREATE GRAPH <ex:graph>;
+CLEAR SILENT GRAPH <ex:graph>;
+CLEAR GRAPH <ex:graph>;
+CLEAR DEFAULT ;
+CLEAR NAMED ;
+CLEAR ALL ;
+DROP SILENT GRAPH <ex:graph>;
+DROP GRAPH <ex:graph>;
+DROP DEFAULT ;
+DROP NAMED ;
+DROP ALL
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/load-into-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/load-into-quads.sparql
new file mode 100644
index 00000000..1b3351e7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/load-into-quads.sparql
@@ -0,0 +1 @@
+LOAD <http://www.w3.org/TR/skos-reference/skos.rdf> INTO GRAPH <urn:namespaces:skos>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/load-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/load-quads.sparql
new file mode 100644
index 00000000..4af27439
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/load-quads.sparql
@@ -0,0 +1 @@
+LOAD <http://www.w3.org/TR/skos-reference/skos.rdf>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-3-quads.sparql
new file mode 100644
index 00000000..e254805a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-3-quads.sparql
@@ -0,0 +1 @@
+COPY DEFAULT TO GRAPH <http://example.org/named>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-4-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-4-quads.sparql
new file mode 100644
index 00000000..0b2b5851
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-4-quads.sparql
@@ -0,0 +1 @@
+MOVE DEFAULT TO GRAPH <http://example.org/named>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-5-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-5-quads.sparql
new file mode 100644
index 00000000..508c663b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql11-query/update/sparql-update-3-2-5-quads.sparql
@@ -0,0 +1 @@
+ADD DEFAULT TO GRAPH <http://example.org/named>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-ar-langdir-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-ar-langdir-quads.sparql
new file mode 100644
index 00000000..96788ced
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-ar-langdir-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?p ?s WHERE {
+  ?s ?p "مرحبا"@ar--rtl .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-ar-langdir.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-ar-langdir.sparql
index 8269361b..96788ced 100644
--- a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-ar-langdir.sparql
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-ar-langdir.sparql
@@ -1,3 +1,3 @@
 SELECT ?p ?s WHERE {
   ?s ?p "مرحبا"@ar--rtl .
-}
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-en-langdir-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-en-langdir-quads.sparql
new file mode 100644
index 00000000..121057eb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-en-langdir-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?p ?s WHERE {
+  ?s ?p "hello"@en--ltr .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-en-langdir.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-en-langdir.sparql
index 76ecd7d7..121057eb 100644
--- a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-en-langdir.sparql
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql12/sparql-1-2-en-langdir.sparql
@@ -1,3 +1,3 @@
 SELECT ?p ?s WHERE {
   ?s ?p "hello"@en--ltr .
-}
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/01-quads.sparql
new file mode 100644
index 00000000..81fe9632
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/01-quads.sparql
@@ -0,0 +1,2 @@
+SELECT * WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/02-quads.sparql
new file mode 100644
index 00000000..81fe9632
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/02-quads.sparql
@@ -0,0 +1,2 @@
+SELECT * WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/03-quads.sparql
new file mode 100644
index 00000000..00bd8ee8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/03-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x ?y ?z WHERE {
+  ?x ?y ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/04-quads.sparql
new file mode 100644
index 00000000..00bd8ee8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/04-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x ?y ?z WHERE {
+  ?x ?y ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/05-quads.sparql
new file mode 100644
index 00000000..89de5cd3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?a ?b ?c ?x ?y ?z WHERE {
+  ?x ?y ?z .
+  ?a ?b ?c .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/06-quads.sparql
new file mode 100644
index 00000000..89de5cd3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/basic/06-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?a ?b ?c ?x ?y ?z WHERE {
+  ?x ?y ?z .
+  ?a ?b ?c .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/01-quads.sparql
new file mode 100644
index 00000000..829e5aa8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/01-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  ?g_0 <http://example.org/ns#p> <http://example.org/ns#q> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/02-quads.sparql
new file mode 100644
index 00000000..829e5aa8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/02-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  ?g_0 <http://example.org/ns#p> <http://example.org/ns#q> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/03-quads.sparql
new file mode 100644
index 00000000..0d71d221
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/03-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?b ?pa ?x ?y WHERE {
+  ?g_0 ?x ?y .
+  ?g_1 ?pa ?b .
+  ?g_0 <http://example.org/ns#p> ?g_1 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/04-quads.sparql
new file mode 100644
index 00000000..829e5aa8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/04-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  ?g_0 <http://example.org/ns#p> <http://example.org/ns#q> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/05-quads.sparql
new file mode 100644
index 00000000..f5bbfa6d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT * WHERE {
+  ?e_a <http://example.org/ns#p1> <http://example.org/ns#q1> .
+  ?e_a <http://example.org/ns#p2> <http://example.org/ns#q2> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/06-clash-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/06-clash-quads.sparql
new file mode 100644
index 00000000..4a0a98fb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/bnodes/06-clash-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?b ?b0 ?b1 WHERE {
+  ?e_b <http://example.org/ns#p> ?b .
+  ?e_b <http://example.org/ns#p> ?b0 .
+  ?e_b0 <http://example.org/ns#p> ?b1 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/01-quads.sparql
new file mode 100644
index 00000000..3b42a085
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( ?o )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/02-quads.sparql
new file mode 100644
index 00000000..cced0298
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/02-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( REGEX( ?o , "foo"^^<http://www.w3.org/2001/XMLSchema#string> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/03-quads.sparql
new file mode 100644
index 00000000..55d0b4bc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/03-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( REGEX( ?o , "foo"@en , "i"^^<http://www.w3.org/2001/XMLSchema#string> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/04-quads.sparql
new file mode 100644
index 00000000..8d8f4a5c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/04-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( <http://www.w3.org/2001/XMLSchema#integer> ( ?o ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/05-quads.sparql
new file mode 100644
index 00000000..9287e44f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/expr/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( <http://example.org/ns#myFunc> ( ?s , ?o ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/forms/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/forms/01-quads.sparql
new file mode 100644
index 00000000..8069fa47
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/forms/01-quads.sparql
@@ -0,0 +1,11 @@
+SELECT ?b ?pa ?x ?y WHERE {
+  ?g_0 ?x ?y .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?g_0 .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  ?g_2 ?pa ?b .
+  ?g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?g_2 .
+  ?g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> ?g_4 .
+  ?g_4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "57"^^<http://www.w3.org/2001/XMLSchema#integer> .
+  ?g_4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  ?g_1 <http://example.org/ns#p> ?g_3 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/forms/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/forms/02-quads.sparql
new file mode 100644
index 00000000..2c22889e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/forms/02-quads.sparql
@@ -0,0 +1,6 @@
+SELECT * WHERE {
+  ?g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?g_0 .
+  ?g_2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> ?g_3 .
+  ?g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?g_1 .
+  ?g_3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/01-quads.sparql
new file mode 100644
index 00000000..1da2a1a2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/01-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
+LIMIT 5
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/02-quads.sparql
new file mode 100644
index 00000000..55736f1d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/02-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
+LIMIT 5 OFFSET 3
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/03-quads.sparql
new file mode 100644
index 00000000..55736f1d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/03-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
+LIMIT 5 OFFSET 3
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/04-quads.sparql
new file mode 100644
index 00000000..87d5af00
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/limit-offset/04-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
+OFFSET 3
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/01-quads.sparql
new file mode 100644
index 00000000..5ff03f88
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/01-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?x ?z WHERE {
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?x .
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  ?g_0 <http://example.org/ns#p> ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/02-quads.sparql
new file mode 100644
index 00000000..700420cd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/02-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?x ?z WHERE {
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?z .
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  ?x <http://example.org/ns#p> ?g_0 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/03-quads.sparql
new file mode 100644
index 00000000..972d5eca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/03-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?z WHERE {
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?z .
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/04-quads.sparql
new file mode 100644
index 00000000..eafdd9d5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/04-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?z WHERE {
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?z .
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> ?g_0 .
+  ?g_1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/05-quads.sparql
new file mode 100644
index 00000000..43fc56cf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lists/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT * WHERE {
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+  ?g_0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/01-quads.sparql
new file mode 100644
index 00000000..d55f7df9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/01-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/02-quads.sparql
new file mode 100644
index 00000000..d55f7df9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/02-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/03-quads.sparql
new file mode 100644
index 00000000..f8e69d2e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/03-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x\"y'z"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/04-quads.sparql
new file mode 100644
index 00000000..f8e69d2e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/04-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x\"y'z"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/05-quads.sparql
new file mode 100644
index 00000000..5fbc9899
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/05-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x\""^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/06-quads.sparql
new file mode 100644
index 00000000..b54a89ce
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/06-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "x'"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/07-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/07-quads.sparql
new file mode 100644
index 00000000..90a70666
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/07-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "123"^^<http://www.w3.org/2001/XMLSchema#integer> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/08-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/08-quads.sparql
new file mode 100644
index 00000000..90a70666
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/08-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "123"^^<http://www.w3.org/2001/XMLSchema#integer> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/09-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/09-quads.sparql
new file mode 100644
index 00000000..0b142e30
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/09-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\n\"\"\nLiteral\n"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/10-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/10-quads.sparql
new file mode 100644
index 00000000..1c36cd23
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/10-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\n'' \"\"\"\nLiteral\n"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/11-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/11-quads.sparql
new file mode 100644
index 00000000..0c2b58d5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/11-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\"\"\"Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/12-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/12-quads.sparql
new file mode 100644
index 00000000..c5b2fefb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/12-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long'''Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/13-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/13-quads.sparql
new file mode 100644
index 00000000..0c2b58d5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/13-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\"\"\"Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/14-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/14-quads.sparql
new file mode 100644
index 00000000..c5b2fefb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/14-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long'''Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/15-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/15-quads.sparql
new file mode 100644
index 00000000..ecaa4886
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/15-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long '' Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/16-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/16-quads.sparql
new file mode 100644
index 00000000..4def5fef
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/16-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long ' Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/17-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/17-quads.sparql
new file mode 100644
index 00000000..613d210d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/17-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long''\\Literal with '\\ single quotes "^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/18-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/18-quads.sparql
new file mode 100644
index 00000000..64b6b5d9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/18-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long \"\" Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/19-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/19-quads.sparql
new file mode 100644
index 00000000..c83c8d11
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/19-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long \" Literal"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/20-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/20-quads.sparql
new file mode 100644
index 00000000..1b9796a9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/lit/20-quads.sparql
@@ -0,0 +1,3 @@
+SELECT * WHERE {
+  <http://example.org/#x> <http://example.org/#p> "Long\"\"\\Literal with \"\\ single quotes"^^<http://www.w3.org/2001/XMLSchema#string> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/opt-filter/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/opt-filter/01-quads.sparql
new file mode 100644
index 00000000..db53fb56
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/opt-filter/01-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?v ?w ?x ?y WHERE {
+  ?x <http://example/p> ?v .
+  OPTIONAL {
+    ?y <http://example/q> ?w .
+    FILTER ( ( ?v = "2"^^<http://www.w3.org/2001/XMLSchema#integer> ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/opt-filter/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/opt-filter/02-quads.sparql
new file mode 100644
index 00000000..9055e1ca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/opt-filter/02-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?v ?w ?x ?y WHERE {
+  ?x <http://example/p> ?v .
+  OPTIONAL {
+    ?y <http://example/q> ?w .
+    FILTER ( ( ( ?v = "2"^^<http://www.w3.org/2001/XMLSchema#integer> ) && ( ?w = "3"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/01-quads.sparql
new file mode 100644
index 00000000..acad388d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/02-quads.sparql
new file mode 100644
index 00000000..61af29dc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/02-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ( ?o + "5"^^<http://www.w3.org/2001/XMLSchema#integer> ) )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/03-quads.sparql
new file mode 100644
index 00000000..acad388d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/03-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( ?o )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/04-quads.sparql
new file mode 100644
index 00000000..1d38f219
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/04-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY DESC ( ?o )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/05-quads.sparql
new file mode 100644
index 00000000..8b1154f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/05-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY DESC ( <http://example.org/ns#func> ( ?s , ?o ) )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/06-quads.sparql
new file mode 100644
index 00000000..6b136c4a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/06-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY DESC ( ( ?o + "57"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) ASC ( <http://example.org/ns#func2> ( ?o ) ) ASC ( ?s )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/07-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/07-quads.sparql
new file mode 100644
index 00000000..6b07b084
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/order/07-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+}
+ORDER BY ASC ( STR( ?o ) )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/01-quads.sparql
new file mode 100644
index 00000000..81fe9632
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/01-quads.sparql
@@ -0,0 +1,2 @@
+SELECT * WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/02-quads.sparql
new file mode 100644
index 00000000..97298f7d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/02-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?a ?y ?z WHERE {
+  ?a <http://example.org/ns#b> <http://example.org/ns#c> .
+  OPTIONAL {
+    <http://example.org/ns#x> <http://example.org/ns#y> <http://example.org/ns#z> .
+  }
+  <http://example.org/ns#x> ?y ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/03-quads.sparql
new file mode 100644
index 00000000..55fd3bcd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/pat/03-quads.sparql
@@ -0,0 +1,12 @@
+SELECT ?a WHERE {
+  OPTIONAL {
+    <http://example.org/ns#x> <http://example.org/ns#y> <http://example.org/ns#z> .
+  }
+  ?a <http://example.org/ns#b> <http://example.org/ns#c> .
+  {
+    <http://example.org/ns#x1> <http://example.org/ns#y1> <http://example.org/ns#z1> .
+  }
+  UNION {
+    <http://example.org/ns#x2> <http://example.org/ns#y2> <http://example.org/ns#z2> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/reduced/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/reduced/01-quads.sparql
new file mode 100644
index 00000000..a6282993
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/reduced/01-quads.sparql
@@ -0,0 +1,3 @@
+SELECT REDUCED ?x ?y ?z WHERE {
+  ?x ?y ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/01-quads.sparql
new file mode 100644
index 00000000..67042389
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT * WHERE {
+  OPTIONAL {
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/02-quads.sparql
new file mode 100644
index 00000000..d8de8eec
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/02-quads.sparql
@@ -0,0 +1,5 @@
+SELECT * WHERE {
+  OPTIONAL {
+    <http://example.org/ns#a> <http://example.org/ns#b> <http://example.org/ns#c> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/13-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/13-quads.sparql
new file mode 100644
index 00000000..8ef2d34a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/dawg-syntax/struct/13-quads.sparql
@@ -0,0 +1,10 @@
+SELECT * WHERE {
+  <http://example.org/ns#p> <http://example.org/ns#q> <http://example.org/ns#r> .
+  OPTIONAL {
+    <http://example.org/ns#a> <http://example.org/ns#b> <http://example.org/ns#c> .
+  }
+  <http://example.org/ns#p> <http://example.org/ns#q> <http://example.org/ns#r> .
+  OPTIONAL {
+    <http://example.org/ns#a> <http://example.org/ns#b> <http://example.org/ns#c> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/agg-empty-group-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/agg-empty-group-quads.sparql
new file mode 100644
index 00000000..f75e34da
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/agg-empty-group-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?x ( MAX( ?value ) AS ?max ) WHERE {
+  ?x <http://example.com/p> ?value .
+}
+GROUP BY ?x
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/avg-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/avg-quads.sparql
new file mode 100644
index 00000000..6fcfd8c9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/avg-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ( AVG( ?o ) AS ?avg ) WHERE {
+  ?s <http://www.example.org/dec> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/avg-with-group-by-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/avg-with-group-by-quads.sparql
new file mode 100644
index 00000000..5c14a29a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/avg-with-group-by-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?s ( AVG( ?o ) AS ?avg ) WHERE {
+  ?s ?p ?o .
+}
+GROUP BY ?s
+HAVING ( AVG( ?o ) <= "2.0"^^<http://www.w3.org/2001/XMLSchema#decimal> )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/count-3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/count-3-quads.sparql
new file mode 100644
index 00000000..382ce20b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/count-3-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?P ( COUNT( ?O ) AS ?C ) WHERE {
+  ?S ?P ?O .
+}
+GROUP BY ?P
+HAVING ( COUNT( ?O ) > "2"^^<http://www.w3.org/2001/XMLSchema#integer> )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/count-8b-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/count-8b-quads.sparql
new file mode 100644
index 00000000..097a965c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/count-8b-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?O12 ( COUNT( ?O1 ) AS ?C ) WHERE {
+  ?S <http://www.example.org/p> ?O1 .
+  ?S <http://www.example.org/q> ?O2 .
+  BIND( ( ?O1 + ?O2 ) AS ?O12 )
+}
+GROUP BY ?O12
+ORDER BY ASC ( ?O12 )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/error-in-avg-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/error-in-avg-quads.sparql
new file mode 100644
index 00000000..8f276200
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/error-in-avg-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?g ( AVG( ?p ) AS ?avg ) ( ( ( MIN( ?p ) + MAX( ?p ) ) / "2"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?c ) WHERE {
+  ?g <http://example.com/data/#p> ?p .
+}
+GROUP BY ?g
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-1-quads.sparql
new file mode 100644
index 00000000..5ac2544e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-1-quads.sparql
@@ -0,0 +1,8 @@
+ASK WHERE {
+  {
+    SELECT ( GROUP_CONCAT( ?o ;SEPARATOR=" " ) AS ?g ) WHERE {
+      ?g_0 <http://www.example.org/p1> ?o .
+    }
+  }
+  FILTER ( ( ( ?g = "1 22"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "22 1"^^<http://www.w3.org/2001/XMLSchema#string> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-2-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-2-quads.sparql
new file mode 100644
index 00000000..9b423be5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-2-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ( COUNT( * ) AS ?c ) WHERE {
+  {
+    SELECT ?p ( GROUP_CONCAT( ?o ;SEPARATOR=" " ) AS ?g ) WHERE {
+      ?g_0 ?p ?o .
+    }
+    GROUP BY ?p
+  }
+  FILTER ( ( ( ( ?p = <http://www.example.org/p1> ) && ( ( ?g = "1 22"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "22 1"^^<http://www.w3.org/2001/XMLSchema#string> ) ) ) || ( ( ?p = <http://www.example.org/p2> ) && ( ( ( ( ( ( ?g = "aaa bb c"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "aaa c bb"^^<http://www.w3.org/2001/XMLSchema#string> ) ) || ( ?g = "bb aaa c"^^<http://www.w3.org/2001/XMLSchema#string> ) ) || ( ?g = "bb c aaa"^^<http://www.w3.org/2001/XMLSchema#string> ) ) || ( ?g = "c aaa bb"^^<http://www.w3.org/2001/XMLSchema#string> ) ) || ( ?g = "c bb aaa"^^<http://www.w3.org/2001/XMLSchema#string> ) ) ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-with-separator-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-with-separator-quads.sparql
new file mode 100644
index 00000000..5ce4a5e4
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/group-concat-with-separator-quads.sparql
@@ -0,0 +1,8 @@
+ASK WHERE {
+  {
+    SELECT ( GROUP_CONCAT( ?o ;SEPARATOR=":" ) AS ?g ) WHERE {
+      ?g_0 <http://www.example.org/p1> ?o .
+    }
+  }
+  FILTER ( ( ( ?g = "1:22"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "22:1"^^<http://www.w3.org/2001/XMLSchema#string> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/protect-from-error-in-avg-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/protect-from-error-in-avg-quads.sparql
new file mode 100644
index 00000000..1ee5d1f1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/protect-from-error-in-avg-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?g ( AVG( IF( ISNUMERIC( ?p ) , ?p , COALESCE( <http://www.w3.org/2001/XMLSchema#double> ( ?p ) , "0"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) ) AS ?avg ) WHERE {
+  ?g <http://example.com/data/#p> ?p .
+}
+GROUP BY ?g
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/sample-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/sample-quads.sparql
new file mode 100644
index 00000000..60a7538c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/aggregates/sample-quads.sparql
@@ -0,0 +1,8 @@
+ASK WHERE {
+  {
+    SELECT ( SAMPLE( ?o ) AS ?sample ) WHERE {
+      ?s <http://www.example.org/dec> ?o .
+    }
+  }
+  FILTER ( ( ( ( ?sample = "1.0"^^<http://www.w3.org/2001/XMLSchema#decimal> ) || ( ?sample = "2.2"^^<http://www.w3.org/2001/XMLSchema#decimal> ) ) || ( ?sample = "3.5"^^<http://www.w3.org/2001/XMLSchema#decimal> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/group-concat-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/group-concat-1-quads.sparql
new file mode 100644
index 00000000..5ac2544e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/group-concat-1-quads.sparql
@@ -0,0 +1,8 @@
+ASK WHERE {
+  {
+    SELECT ( GROUP_CONCAT( ?o ;SEPARATOR=" " ) AS ?g ) WHERE {
+      ?g_0 <http://www.example.org/p1> ?o .
+    }
+  }
+  FILTER ( ( ( ?g = "1 22"^^<http://www.w3.org/2001/XMLSchema#string> ) || ( ?g = "22 1"^^<http://www.w3.org/2001/XMLSchema#string> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/in-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/in-1-quads.sparql
new file mode 100644
index 00000000..59107b98
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/in-1-quads.sparql
@@ -0,0 +1,3 @@
+ASK WHERE {
+  FILTER ( ( "2"^^<http://www.w3.org/2001/XMLSchema#integer> IN ( "1"^^<http://www.w3.org/2001/XMLSchema#integer> , "2"^^<http://www.w3.org/2001/XMLSchema#integer> , "3"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/not-in-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/not-in-1-quads.sparql
new file mode 100644
index 00000000..b042305e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/not-in-1-quads.sparql
@@ -0,0 +1,3 @@
+ASK WHERE {
+  FILTER ( ( "2"^^<http://www.w3.org/2001/XMLSchema#integer> NOT IN ( ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.sparql
new file mode 100644
index 00000000..e56282fe
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/sparqldl-05.rq-simple-undistinguished-variable-test-quads.sparql
@@ -0,0 +1,3 @@
+ASK WHERE {
+  ?e_a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/test#Person> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.sparql
new file mode 100644
index 00000000..fc91fd88
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/sparqldl-06.rq-cycle-of-undistinguished-variables-quads.sparql
@@ -0,0 +1,6 @@
+ASK WHERE {
+  <http://example.org/test#a> <http://example.org/test#p> ?e_aa .
+  ?e_aa <http://example.org/test#r> ?e_dd .
+  ?e_dd <http://example.org/test#t> ?e_bb .
+  ?e_bb <http://example.org/test#s> <http://example.org/test#a> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/syn-pname-01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/syn-pname-01-quads.sparql
new file mode 100644
index 00000000..fcbeed5d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/ask/syn-pname-01-quads.sparql
@@ -0,0 +1,2 @@
+ASK WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/01-quads.sparql
new file mode 100644
index 00000000..dc685607
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/01-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ( ( ?o + "10"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z ) WHERE {
+  ?s ?p ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/02-quads.sparql
new file mode 100644
index 00000000..a635d356
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/02-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?o ( ( ?o + "10"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z ) ( ( ?o + "100"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z2 ) WHERE {
+  ?s ?p ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/03-quads.sparql
new file mode 100644
index 00000000..4e13bdb6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/03-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?z ?s1 WHERE {
+  {
+    ?s ?p ?o .
+    BIND( ( ?o + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+  ?s1 ?p1 ?z .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/04-quads.sparql
new file mode 100644
index 00000000..7d142d8f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/04-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?o ?p ?s ( ?nova AS ?z ) WHERE {
+  ?s ?p ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/05-quads.sparql
new file mode 100644
index 00000000..804c329b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/05-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?s ?p ?o ?z WHERE {
+  {
+    ?s ?p ?o .
+    BIND( ( ?o + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+  FILTER ( ( ?z = "3"^^<http://www.w3.org/2001/XMLSchema#integer> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/07-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/07-quads.sparql
new file mode 100644
index 00000000..e85b8dac
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/07-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ?s ?p ?o ?z WHERE {
+  ?s ?p ?o .
+  {
+    BIND( ( ?o + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+  UNION {
+    BIND( ( ?o + "2"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/08-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/08-quads.sparql
new file mode 100644
index 00000000..804c329b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/08-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?s ?p ?o ?z WHERE {
+  {
+    ?s ?p ?o .
+    BIND( ( ?o + "1"^^<http://www.w3.org/2001/XMLSchema#integer> ) AS ?z )
+  }
+  FILTER ( ( ?z = "3"^^<http://www.w3.org/2001/XMLSchema#integer> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/10-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/10-quads.sparql
new file mode 100644
index 00000000..19faf777
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/10-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ?s ?v ?z WHERE {
+  {
+    BIND( "4"^^<http://www.w3.org/2001/XMLSchema#integer> AS ?z )
+  }
+  {
+    ?s <http://example.org/p> ?v .
+    FILTER ( ( ?v = ?z ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/11-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/11-quads.sparql
new file mode 100644
index 00000000..c5b4e7bf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/bind/11-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?s ?v ?z WHERE {
+  {
+    BIND( "4"^^<http://www.w3.org/2001/XMLSchema#integer> AS ?z )
+  }
+  ?s <http://example.org/p> ?v .
+  FILTER ( ( ?v = ?z ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/construct-from-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/construct-from-quads.sparql
new file mode 100644
index 00000000..13f2991b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/construct-from-quads.sparql
@@ -0,0 +1,7 @@
+CONSTRUCT {
+  ?s ?p ?o .
+}
+FROM <http://example.com/data> WHERE {
+  ?s ?p ?o .
+}
+LIMIT 100
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/construct-slice-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/construct-slice-quads.sparql
new file mode 100644
index 00000000..0137b4ca
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/construct-slice-quads.sparql
@@ -0,0 +1,7 @@
+CONSTRUCT {
+  ?s ?p ?o .
+}
+WHERE {
+  ?s ?p ?o .
+}
+LIMIT 100
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere01-quads.sparql
new file mode 100644
index 00000000..c20b63c8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere01-quads.sparql
@@ -0,0 +1,6 @@
+CONSTRUCT {
+  ?s ?p ?o .
+}
+WHERE {
+  ?s ?p ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere02-quads.sparql
new file mode 100644
index 00000000..380ea468
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere02-quads.sparql
@@ -0,0 +1,8 @@
+CONSTRUCT {
+  <http://example.org/s1> <http://example.org/p> ?o .
+  ?s2 <http://example.org/p> ?o .
+}
+WHERE {
+  <http://example.org/s1> <http://example.org/p> ?o .
+  ?s2 <http://example.org/p> ?o .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere03-quads.sparql
new file mode 100644
index 00000000..204f4d2f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere03-quads.sparql
@@ -0,0 +1,8 @@
+CONSTRUCT {
+  <http://example.org/s2> <http://example.org/p> ?o1 .
+  <http://example.org/s2> <http://example.org/p> ?o2 .
+}
+WHERE {
+  <http://example.org/s2> <http://example.org/p> ?o1 .
+  <http://example.org/s2> <http://example.org/p> ?o2 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere05-modified-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere05-modified-quads.sparql
new file mode 100644
index 00000000..5937d55c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere05-modified-quads.sparql
@@ -0,0 +1,9 @@
+CONSTRUCT {
+  ?s ?p ?o .
+}
+WHERE {
+  {
+    ?s ?p ?o .
+    FILTER ( ( ?o = <http://example.org/o1> ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere06-quads.sparql
new file mode 100644
index 00000000..966dfba3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/construct/constructwhere06-quads.sparql
@@ -0,0 +1,6 @@
+CONSTRUCT {
+  _:e_s_b ?p _:e_o_b .
+}
+WHERE {
+  ?e_s_b ?p ?e_o_b .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.sparql
new file mode 100644
index 00000000..04cb6b00
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/exists/nested-negative-exists-in-positive-exists-quads.sparql
@@ -0,0 +1,13 @@
+SELECT ?p ?s WHERE {
+  ?s ?p <http://www.example.org/o> .
+  FILTER ( EXISTS {
+    {
+      ?s ?p <http://www.example.org/o1> .
+      FILTER ( NOT EXISTS {
+        ?s ?p <http://www.example.org/o2> .
+      }
+      )
+    }
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/exists/nested-positive-exists-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/exists/nested-positive-exists-quads.sparql
new file mode 100644
index 00000000..40df757e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/exists/nested-positive-exists-quads.sparql
@@ -0,0 +1,13 @@
+SELECT ?p ?s WHERE {
+  ?s ?p <http://www.example.org/o> .
+  FILTER ( EXISTS {
+    {
+      ?s ?p <http://www.example.org/o1> .
+      FILTER ( EXISTS {
+        ?s ?p <http://www.example.org/o2> .
+      }
+      )
+    }
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/bnode-str-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/bnode-str-quads.sparql
new file mode 100644
index 00000000..93fef861
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/bnode-str-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?s1 ?s2 ( BNODE( ?s1 ) AS ?b1 ) ( BNODE( ?s2 ) AS ?b2 ) WHERE {
+  ?a <http://example.org/str> ?s1 .
+  ?b <http://example.org/str> ?s2 .
+  FILTER ( ( ( ( ?a = <http://example.org/s1> ) || ( ?a = <http://example.org/s3> ) ) && ( ( ?b = <http://example.org/s1> ) || ( ?b = <http://example.org/s3> ) ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/now-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/now-quads.sparql
new file mode 100644
index 00000000..5de81b1c
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/now-quads.sparql
@@ -0,0 +1,6 @@
+ASK WHERE {
+  {
+    BIND( NOW( ) AS ?n )
+  }
+  FILTER ( ( DATATYPE( ?n ) = <http://www.w3.org/2001/XMLSchema#dateTime> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/strlang-str-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/strlang-str-quads.sparql
new file mode 100644
index 00000000..fe40fbd8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/functions/strlang-str-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?s ( STRLANG( STR( ?str ) , "en-US"^^<http://www.w3.org/2001/XMLSchema#string> ) AS ?s2 ) WHERE {
+  ?s <http://example.org/str> ?str .
+  FILTER ( LANGMATCHES( LANG( ?str ) , "en"^^<http://www.w3.org/2001/XMLSchema#string> ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/01-quads.sparql
new file mode 100644
index 00000000..5ed3e159
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?s WHERE {
+  ?s <http://example/p> ?v .
+}
+GROUP BY ?s
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/03-quads.sparql
new file mode 100644
index 00000000..20b7e088
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/03-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?w ( SAMPLE( ?v ) AS ?S ) WHERE {
+  ?s <http://example/p> ?v .
+  OPTIONAL {
+    ?s <http://example/q> ?w .
+  }
+}
+GROUP BY ?w
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/04-quads.sparql
new file mode 100644
index 00000000..98e29058
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/group/04-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?X ( SAMPLE( ?v ) AS ?S ) WHERE {
+  ?s <http://example/p> ?v .
+  OPTIONAL {
+    ?s <http://example/q> ?w .
+  }
+  BIND( COALESCE( ?w , "1605-11-05"^^<http://www.w3.org/2001/XMLSchema#date> ) AS ?X )
+}
+GROUP BY ?X
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.sparql
new file mode 100644
index 00000000..7e032caf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/calculate-which-sets-have-the-same-elements-quads.sparql
@@ -0,0 +1,27 @@
+SELECT DISTINCT ?s1 ?s2 WHERE {
+  ?s2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+  ?s1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+  MINUS {
+    {
+      ?s1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+      ?s2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+      ?s1 <http://example/member> ?x .
+      FILTER ( NOT EXISTS {
+        ?s2 <http://example/member> ?x .
+      }
+      )
+    }
+  }
+  MINUS {
+    {
+      ?s1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+      ?s2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Set> .
+      ?s2 <http://example/member> ?x .
+      FILTER ( NOT EXISTS {
+        ?s1 <http://example/member> ?x .
+      }
+      )
+    }
+  }
+  FILTER ( ( STR( ?s1 ) < STR( ?s2 ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.sparql
new file mode 100644
index 00000000..525c407b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/medical-temporal-proximity-by-exclusion-not-exists-quads.sparql
@@ -0,0 +1,13 @@
+SELECT ?exam ?date WHERE {
+  ?exam <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#PhysicalExamination> .
+  ?exam <http://purl.org/dc/elements/1.1/date> ?date .
+  ?exam <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#precedes> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#operation1> .
+  ?op <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#SurgicalProcedure> .
+  ?op <http://purl.org/dc/elements/1.1/date> ?opDT .
+  FILTER ( NOT EXISTS {
+    ?otherExam <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#PhysicalExamination> .
+    ?otherExam <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#follows> ?exam .
+    ?otherExam <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#precedes> <http://www.w3.org/2009/sparql/docs/tests/data-sparql11/negation#operation1> .
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/simple-minus-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/simple-minus-quads.sparql
new file mode 100644
index 00000000..0937a3ea
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/simple-minus-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?prefLabel ?uri WHERE {
+  ?uri <http://www.w3.org/2004/02/skos/core#prefLabel> ?prefLabel .
+  MINUS {
+    ?uri <http://www.w3.org/2004/02/skos/core#broader> <https://test.com/> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.sparql
new file mode 100644
index 00000000..90e6a517
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-fully-bound-minuend-quads.sparql
@@ -0,0 +1,14 @@
+SELECT ?a ?b ?c WHERE {
+  ?a <http://example/p1> ?b .
+  ?a <http://example/p2> ?c .
+  MINUS {
+    ?d <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Sub> .
+    OPTIONAL {
+      ?d <http://example/q1> ?b .
+    }
+    OPTIONAL {
+      ?d <http://example/q2> ?c .
+    }
+  }
+}
+ORDER BY ASC ( ?a )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.sparql
new file mode 100644
index 00000000..0f6158e1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/negation/subtraction-with-minus-from-a-partially-bound-minuend-quads.sparql
@@ -0,0 +1,19 @@
+SELECT ?a ?b ?c WHERE {
+  ?a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Min> .
+  OPTIONAL {
+    ?a <http://example/p1> ?b .
+  }
+  OPTIONAL {
+    ?a <http://example/p2> ?c .
+  }
+  MINUS {
+    ?d <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example/Sub> .
+    OPTIONAL {
+      ?d <http://example/q1> ?b .
+    }
+    OPTIONAL {
+      ?d <http://example/q2> ?c .
+    }
+  }
+}
+ORDER BY ASC ( ?a )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/01-simple-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/01-simple-path-quads.sparql
new file mode 100644
index 00000000..40657b2e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/01-simple-path-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> <http://www.example.org/schema#p1> ?var0 .
+  ?var0 <http://www.example.org/schema#p2> ?var1 .
+  ?var1 <http://www.example.org/schema#p3> ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/02-star-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/02-star-path-quads.sparql
new file mode 100644
index 00000000..c4210e8b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/02-star-path-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> ((<http://www.example.org/schema#p1>/<http://www.example.org/schema#p2>/<http://www.example.org/schema#p3>)*) ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/08-reverse-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/08-reverse-path-quads.sparql
new file mode 100644
index 00000000..b0742433
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/08-reverse-path-quads.sparql
@@ -0,0 +1,3 @@
+ASK WHERE {
+  <http://www.example.org/instance#a> <http://www.example.org/schema#p> <http://www.example.org/instance#b> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/09-reverse-sequence-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/09-reverse-sequence-path-quads.sparql
new file mode 100644
index 00000000..2d6ae0a9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/09-reverse-sequence-path-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?x WHERE {
+  ?x <http://www.example.org/schema#p1> ?var0 .
+  ?var0 <http://www.example.org/schema#p2> <http://www.example.org/instance#c> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/10-path-with-negation-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/10-path-with-negation-quads.sparql
new file mode 100644
index 00000000..95523b3f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/10-path-with-negation-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> (!(<http://www.example.org/schema#p1>|<http://www.example.org/schema#p2>)) ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.sparql
new file mode 100644
index 00000000..2e2dbf88
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/12-variable-length-path-and-two-paths-to-same-target-node-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> ((<http://www.example.org/schema#p1>/<http://www.example.org/schema#p2>)+) ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/14-star-path-over-foaf-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/14-star-path-over-foaf-quads.sparql
new file mode 100644
index 00000000..18ee386f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/14-star-path-over-foaf-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?X ?Y WHERE {
+  ?X (<http://xmlns.com/foaf/0.1/knows>*) ?Y .
+}
+ORDER BY ASC ( ?X ) ASC ( ?Y )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/14-star-path-over-foafknows-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/14-star-path-over-foafknows-quads.sparql
new file mode 100644
index 00000000..18ee386f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/14-star-path-over-foafknows-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?X ?Y WHERE {
+  ?X (<http://xmlns.com/foaf/0.1/knows>*) ?Y .
+}
+ORDER BY ASC ( ?X ) ASC ( ?Y )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/28a-diamond-with-loop-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/28a-diamond-with-loop-quads.sparql
new file mode 100644
index 00000000..65a624b5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/28a-diamond-with-loop-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?t WHERE {
+  <http://example/a> ((<http://example/p>/<http://example/p>)?) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/30-operator-precedence-1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/30-operator-precedence-1-quads.sparql
new file mode 100644
index 00000000..4fbc59a0
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/30-operator-precedence-1-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?t WHERE {
+  <http://www.example.org/a> (<http://www.example.org/p1>|(<http://www.example.org/p2>/<http://www.example.org/p3>)|<http://www.example.org/p4>) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/31-operator-precedence-2-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/31-operator-precedence-2-quads.sparql
new file mode 100644
index 00000000..e2850fb3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/31-operator-precedence-2-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?t WHERE {
+  <http://www.example.org/a> (<http://www.example.org/p1>|<http://www.example.org/p2>) ?var0 .
+  ?var0 (<http://www.example.org/p3>|<http://www.example.org/p4>) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/32-operator-precedence-3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/32-operator-precedence-3-quads.sparql
new file mode 100644
index 00000000..05f52b6a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/32-operator-precedence-3-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?t WHERE {
+  <http://www.example.org/a> (<http://www.example.org/p0>|((^<http://www.example.org/p1>)/<http://www.example.org/p2>)|<http://www.example.org/p3>) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/33-operator-precedence-4-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/33-operator-precedence-4-quads.sparql
new file mode 100644
index 00000000..637fa8cd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/33-operator-precedence-4-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?t WHERE {
+  <http://www.example.org/a> (((<http://www.example.org/p0>|(^<http://www.example.org/p1>))/<http://www.example.org/p2>)|<http://www.example.org/p3>) ?t .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/37-nested-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/37-nested-quads.sparql
new file mode 100644
index 00000000..e28e896a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/37-nested-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?X WHERE {
+  <http://example.org/A0> ((<http://example.org/P>*)*) ?X .
+}
+ORDER BY ASC ( ?X )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/path-union-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/path-union-quads.sparql
new file mode 100644
index 00000000..890edc01
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/paths/path-union-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ?instanceOf ?item WHERE {
+  {
+    ?item <http://www.wikidata.org/prop/direct/P31> <http://www.wikidata.org/entity/Q486972> .
+  }
+  UNION {
+    ?item <http://www.wikidata.org/prop/direct/P31> ?instanceOf .
+    ?instanceOf (<http://www.wikidata.org/prop/direct/P279>+) <http://www.wikidata.org/entity/Q486972> .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service01-quads.sparql
new file mode 100644
index 00000000..d7973505
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service01-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  SERVICE <http://example.org/sparql> {
+    ?s ?p2 ?o2 .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service02-quads.sparql
new file mode 100644
index 00000000..7c326c04
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service02-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  SERVICE <http://example1.org/sparql> {
+    ?s ?p ?o1 .
+  }
+  OPTIONAL {
+    SERVICE <http://example2.org/sparql> {
+      ?s ?p2 ?o2 .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service03-quads.sparql
new file mode 100644
index 00000000..9dff1348
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service03-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  SERVICE <http://example1.org/sparql> {
+    ?s ?p ?o1 .
+    OPTIONAL {
+      SERVICE <http://example2.org/sparql> {
+        ?s ?p2 ?o2 .
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service04-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service04-quads.sparql
new file mode 100644
index 00000000..3a4c48da
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service04-quads.sparql
@@ -0,0 +1,11 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  OPTIONAL {
+    SERVICE <http://example.org/sparql> {
+      ?s <http://xmlns.com/foaf/0.1/knows> ?o2 .
+    }
+  }
+  VALUES ?o2 {
+    <http://example.org/b>
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service05-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service05-quads.sparql
new file mode 100644
index 00000000..f61998e6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service05-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?service ?title WHERE {
+  {
+    ?p <http://purl.org/dc/elements/1.1/subject> ?projectSubject .
+    ?p <http://rdfs.org/ns/void#sparqlEndpoint> ?service .
+    FILTER ( REGEX( ?projectSubject , "remote"^^<http://www.w3.org/2001/XMLSchema#string> ) )
+  }
+  SERVICE ?service {
+    ?project <http://usefulinc.com/ns/doap#name> ?title .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service06-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service06-quads.sparql
new file mode 100644
index 00000000..a60aa5c9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service06-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  SERVICE <http://example1.org/sparql> {
+    ?s ?p ?o1 .
+    OPTIONAL {
+      SERVICE SILENT <http://invalid.endpoint.org/sparql> {
+        ?s ?p2 ?o2 .
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service07-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service07-quads.sparql
new file mode 100644
index 00000000..a8162f06
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/service/service07-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p ?o1 .
+  SERVICE SILENT <http://invalid.endpoint.org/sparql> {
+    ?s ?p2 ?o2 .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/06-subquery-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/06-subquery-quads.sparql
new file mode 100644
index 00000000..93e325fb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/06-subquery-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?x WHERE {
+  SELECT ?p ?x ?y WHERE {
+    ?x ?p ?y .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.sparql
new file mode 100644
index 00000000..e9a25563
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/08-subquery-with-aggregate-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?x ?max WHERE {
+  {
+    SELECT ( MAX( ?y ) AS ?max ) WHERE {
+      ?x <http://www.example.org/schema#p> ?y .
+    }
+  }
+  ?x <http://www.example.org/schema#p> ?max .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/09-nested-subqueries-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/09-nested-subqueries-quads.sparql
new file mode 100644
index 00000000..7a4d3652
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/09-nested-subqueries-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?x ?y WHERE {
+  {
+    SELECT ?x WHERE {
+      SELECT ?x WHERE {
+        ?x <http://www.example.org/schema#q> ?t .
+      }
+    }
+  }
+  ?x <http://www.example.org/schema#p> ?y .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.sparql
new file mode 100644
index 00000000..c8c32cc6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/subqueries/11-subquery-limit-per-resource-quads.sparql
@@ -0,0 +1,12 @@
+SELECT ?L WHERE {
+  ?g_0 <http://www.w3.org/2000/01/rdf-schema#label> ?L .
+  ?O <http://www.example.orghasItem> ?g_0 .
+  {
+    SELECT DISTINCT ?O WHERE {
+      ?O <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.example.orgOrder> .
+    }
+    ORDER BY ASC ( ?O )
+    LIMIT 2
+  }
+}
+ORDER BY ASC ( ?L )
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/aggregate-15-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/aggregate-15-quads.sparql
new file mode 100644
index 00000000..5022e0a8
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/aggregate-15-quads.sparql
@@ -0,0 +1,2 @@
+SELECT ( GROUP_CONCAT( ?x ;SEPARATOR=";" ) AS ?y ) WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/bindscope1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/bindscope1-quads.sparql
new file mode 100644
index 00000000..ac58082e
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/bindscope1-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?o ?o1 WHERE {
+  {
+    <http://www.example.orgs> <http://www.example.orgp> ?o .
+    BIND( ( "1"^^<http://www.w3.org/2001/XMLSchema#integer> + ?o ) AS ?o1 )
+  }
+  <http://www.example.orgs> <http://www.example.orgq> ?o1 .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-oneof-01-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-oneof-01-quads.sparql
new file mode 100644
index 00000000..cba91fa5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-oneof-01-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( ( ?o NOT IN ( "1"^^<http://www.w3.org/2001/XMLSchema#integer> , "2"^^<http://www.w3.org/2001/XMLSchema#integer> , ( ?s + "57"^^<http://www.w3.org/2001/XMLSchema#integer> ) ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-oneof-03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-oneof-03-quads.sparql
new file mode 100644
index 00000000..966db835
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-oneof-03-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o ?p ?s WHERE {
+  ?s ?p ?o .
+  FILTER ( ( ?o IN ( "1"^^<http://www.w3.org/2001/XMLSchema#integer> , <x:x> ) ) )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-subquery-02-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-subquery-02-quads.sparql
new file mode 100644
index 00000000..15dea7dd
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/syntax/syntax-subquery-02-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?o ?p ?s WHERE {
+  SELECT ?o ?p ?s WHERE {
+    ?s ?p ?o .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/01-bind-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/01-bind-quads.sparql
new file mode 100644
index 00000000..12c070a2
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/01-bind-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?book ?title ?price WHERE {
+  VALUES ?book {
+    <http://example.org/book/book1>
+  }
+  ?book <http://purl.org/dc/elements/1.1/title> ?title .
+  ?book <http://example.org/ns#price> ?price .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.sparql
new file mode 100644
index 00000000..2317c33a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-1-row-with-undef-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  ?s ?p2 ?o2 .
+  VALUES( ?o1 ?o2 ){
+    ( "Alan"^^<http://www.w3.org/2001/XMLSchema#string> UNDEF )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.sparql
new file mode 100644
index 00000000..be3200ee
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-2-obj-vars-2-rows-with-undef-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  ?s ?p2 ?o2 .
+  VALUES( ?o1 ?o2 ){
+    ( UNDEF "Alan"^^<http://www.w3.org/2001/XMLSchema#string> )
+    ( <http://example.org/b> UNDEF )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.sparql
new file mode 100644
index 00000000..b4cab995
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-optional-obj-var-1-row-quads.sparql
@@ -0,0 +1,9 @@
+SELECT ?s ?o1 ?o2 WHERE {
+  ?s ?p1 ?o1 .
+  OPTIONAL {
+    ?s <http://xmlns.com/foaf/0.1/knows> ?o2 .
+  }
+  VALUES ?o2 {
+    <http://example.org/b>
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.sparql
new file mode 100644
index 00000000..4bc29135
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-query-values-with-subj-var-1-row-quads.sparql
@@ -0,0 +1,7 @@
+SELECT ?book ?title ?price WHERE {
+  ?book <http://purl.org/dc/elements/1.1/title> ?title .
+  ?book <http://example.org/ns#price> ?price .
+  VALUES ?book {
+    <http://example.org/book/book1>
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-subquery-values-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-subquery-values-quads.sparql
new file mode 100644
index 00000000..fff5e666
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/post-subquery-values-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?s ?o WHERE {
+  SELECT ?o ?p ?s WHERE {
+    ?s ?p ?o .
+    VALUES ?o {
+      <http://example.org/b>
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/values-many-once-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/values-many-once-quads.sparql
new file mode 100644
index 00000000..d1d292f1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/values/values-many-once-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?y ?z WHERE {
+  VALUES( ?y ?z ){
+    ( <http://example.com/ns#a><http://example.com/ns#b> )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.1-quads.sparql
new file mode 100644
index 00000000..9310fa7d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.1-quads.sparql
@@ -0,0 +1,2 @@
+DESCRIBE <http://example.org/> WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.2a-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.2a-quads.sparql
new file mode 100644
index 00000000..247bd5bf
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.2a-quads.sparql
@@ -0,0 +1,3 @@
+DESCRIBE ?x WHERE {
+  ?x <http://xmlns.com/foaf/0.1/mbox> <mailto:alice@org> .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.2c-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.2c-quads.sparql
new file mode 100644
index 00000000..dbc7de56
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/16.4.2c-quads.sparql
@@ -0,0 +1,3 @@
+DESCRIBE ?x?y<http://example.org/> WHERE {
+  ?x <http://xmlns.com/foaf/0.1/knows> ?y .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/star-empty-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/star-empty-quads.sparql
new file mode 100644
index 00000000..6576f231
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/star-empty-quads.sparql
@@ -0,0 +1,2 @@
+DESCRIBE * WHERE {
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/star-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/star-quads.sparql
new file mode 100644
index 00000000..d19a63b5
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/describe/star-quads.sparql
@@ -0,0 +1,3 @@
+DESCRIBE ?x?y WHERE {
+  ?x <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> ?y .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/empty-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/empty-quads.sparql
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/existence-subquery-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/existence-subquery-quads.sparql
new file mode 100644
index 00000000..cfee9662
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/existence-subquery-quads.sparql
@@ -0,0 +1,12 @@
+SELECT ?s ?p ?o WHERE {
+  ?a <https://mydom2#predB> ?b .
+  FILTER ( EXISTS {
+    ?var0 <https://mydom2#predN> ?q .
+    {
+      SELECT ( ?_s AS ?q2 ) ( ?_o AS ?var0 ) WHERE {
+        ?_s ?p ?_o .
+      }
+    }
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/filter-union-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/filter-union-quads.sparql
new file mode 100644
index 00000000..87ee0d24
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/filter-union-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?this WHERE {
+  {
+    FILTER ( "false"^^<http://www.w3.org/2001/XMLSchema#boolean> )
+  }
+  UNION {
+    FILTER ( ( ?this = <http://example.org/InvalidResource> ) )
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.1-quads.sparql
new file mode 100644
index 00000000..32450449
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.1-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?name FROM <http://example.org/foaf/aliceFoaf> WHERE {
+  ?x <http://xmlns.com/foaf/0.1/name> ?name .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.2-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.2-quads.sparql
new file mode 100644
index 00000000..c0aed975
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.2-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?name FROM NAMED <http://example.org/alice> FROM NAMED <http://example.org/bob> WHERE {
+  ?x <http://xmlns.com/foaf/0.1/name> ?name .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.3-quads.sparql
new file mode 100644
index 00000000..5dff0fa9
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.2.3-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?who ?g ?mbox FROM <http://example.org/dft.ttl> FROM NAMED <http://example.org/alice> FROM NAMED <http://example.org/bob> WHERE {
+  ?g <http://purl.org/dc/elements/1.1/publisher> ?who .
+  GRAPH ?g {
+    ?x <http://xmlns.com/foaf/0.1/mbox> ?mbox .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.1-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.1-quads.sparql
new file mode 100644
index 00000000..a2a8f3c3
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.1-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?src ?bobNick FROM NAMED <http://example.org/foaf/aliceFoaf> FROM NAMED <http://example.org/foaf/bobFoaf> WHERE {
+  GRAPH ?src {
+    ?x <http://xmlns.com/foaf/0.1/mbox> <mailto:bob@work.example> .
+    ?x <http://xmlns.com/foaf/0.1/nick> ?bobNick .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.2-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.2-quads.sparql
new file mode 100644
index 00000000..6941318b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.2-quads.sparql
@@ -0,0 +1,6 @@
+SELECT ?nick FROM NAMED <http://example.org/foaf/aliceFoaf> FROM NAMED <http://example.org/foaf/bobFoaf> WHERE {
+  GRAPH <http://example.org/foaf/bobFoaf> {
+    ?x <http://xmlns.com/foaf/0.1/mbox> <mailto:bob@work.example> .
+    ?x <http://xmlns.com/foaf/0.1/nick> ?nick .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.3-quads.sparql
new file mode 100644
index 00000000..98667bae
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.3-quads.sparql
@@ -0,0 +1,13 @@
+SELECT ?mbox ?nick ?ppd FROM NAMED <http://example.org/foaf/aliceFoaf> FROM NAMED <http://example.org/foaf/bobFoaf> WHERE {
+  GRAPH <http://example.org/foaf/aliceFoaf> {
+    ?alice <http://xmlns.com/foaf/0.1/mbox> <mailto:alice@work.example> .
+    ?alice <http://xmlns.com/foaf/0.1/knows> ?whom .
+    ?whom <http://xmlns.com/foaf/0.1/mbox> ?mbox .
+    ?whom <http://www.w3.org/2000/01/rdf-schema#seeAlso> ?ppd .
+    ?ppd <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/PersonalProfileDocument> .
+  }
+  GRAPH ?ppd {
+    ?w <http://xmlns.com/foaf/0.1/mbox> ?mbox .
+    ?w <http://xmlns.com/foaf/0.1/nick> ?nick .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.4-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.4-quads.sparql
new file mode 100644
index 00000000..e5bab0fa
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/from/13.3.4-quads.sparql
@@ -0,0 +1,8 @@
+SELECT ?name ?mbox ?date WHERE {
+  ?g <http://purl.org/dc/elements/1.1/publisher> ?name .
+  ?g <http://purl.org/dc/elements/1.1/date> ?date .
+  GRAPH ?g {
+    ?person <http://xmlns.com/foaf/0.1/name> ?name .
+    ?person <http://xmlns.com/foaf/0.1/mbox> ?mbox .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/group-by-no-var-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/group-by-no-var-quads.sparql
new file mode 100644
index 00000000..df04e2b6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/group-by-no-var-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ( MAX( ?y ) AS ?yy ) WHERE {
+  ?x ?y ?z .
+  BIND( STR( ?x ) AS ?var1 )
+}
+GROUP BY ?var1
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/negate-and-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/negate-and-quads.sparql
new file mode 100644
index 00000000..cdadbccc
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/negate-and-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ?c WHERE {
+  ?c <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
+  FILTER ( ! ( BOUND( ?c ) && REGEX( STR( ?c ) , "^toto"^^<http://www.w3.org/2001/XMLSchema#string> , "i"^^<http://www.w3.org/2001/XMLSchema#string> ) ) )
+}
+LIMIT 10
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/negated-path-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/negated-path-quads.sparql
new file mode 100644
index 00000000..fd8707a1
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/negated-path-quads.sparql
@@ -0,0 +1,4 @@
+SELECT ?o WHERE {
+  <http://dbpedia.org/resource/12_Monkeys> (!(<http://dbpedia.org/ontology/starring>)) ?o .
+}
+LIMIT 100
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/nested-union-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/nested-union-quads.sparql
new file mode 100644
index 00000000..8f0c894d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/nested-union-quads.sparql
@@ -0,0 +1,20 @@
+SELECT ?label ?Label ?pLabel ?s WHERE {
+  {
+    ?s <http://xlabelA> ?pLabel .
+    {
+      ?s <http://xlabelC> ?Label .
+    }
+    UNION {
+      ?s <http://xlabelD> ?label .
+    }
+  }
+  UNION {
+    ?s <http://xlabelB> ?pLabel .
+    {
+      ?s <http://xlabelC> ?Label .
+    }
+    UNION {
+      ?s <http://xlabelD> ?label .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/path-inverse-negation-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/path-inverse-negation-quads.sparql
new file mode 100644
index 00000000..2cd1c46a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/path-inverse-negation-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?x WHERE {
+  <http://www.example.org/instance#a> (!(<http://www.example.org/schema#p1>|^<http://www.example.org/schema#p2>)) ?x .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/project-filter-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/project-filter-quads.sparql
new file mode 100644
index 00000000..a4eb0b3d
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/project-filter-quads.sparql
@@ -0,0 +1,10 @@
+SELECT ?n ?x WHERE {
+  ?x <http://example.com/p> ?n .
+  FILTER ( NOT EXISTS {
+    {
+      ?x <http://example.com/q> ?m .
+      FILTER ( ( ?n = ?m ) )
+    }
+  }
+  )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/unused-extend-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/unused-extend-quads.sparql
new file mode 100644
index 00000000..8f0c2e3a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/unused-extend-quads.sparql
@@ -0,0 +1,5 @@
+SELECT ( ?duration AS ?d ) WHERE {
+  ?a <http://mydom#startTime> ?st .
+  ?a <http://mydom#endTime> ?et .
+  BIND( ( ?et - ?st ) AS ?duration )
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/clear-drop-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/clear-drop-quads.sparql
new file mode 100644
index 00000000..abc77c23
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/clear-drop-quads.sparql
@@ -0,0 +1,12 @@
+CREATE SILENT GRAPH <ex:graph>;
+CREATE GRAPH <ex:graph>;
+CLEAR SILENT GRAPH <ex:graph>;
+CLEAR GRAPH <ex:graph>;
+CLEAR DEFAULT ;
+CLEAR NAMED ;
+CLEAR ALL ;
+DROP SILENT GRAPH <ex:graph>;
+DROP GRAPH <ex:graph>;
+DROP DEFAULT ;
+DROP NAMED ;
+DROP ALL
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/load-into-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/load-into-quads.sparql
new file mode 100644
index 00000000..1b3351e7
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/load-into-quads.sparql
@@ -0,0 +1 @@
+LOAD <http://www.w3.org/TR/skos-reference/skos.rdf> INTO GRAPH <urn:namespaces:skos>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/load-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/load-quads.sparql
new file mode 100644
index 00000000..4af27439
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/load-quads.sparql
@@ -0,0 +1 @@
+LOAD <http://www.w3.org/TR/skos-reference/skos.rdf>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-3-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-3-quads.sparql
new file mode 100644
index 00000000..e254805a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-3-quads.sparql
@@ -0,0 +1 @@
+COPY DEFAULT TO GRAPH <http://example.org/named>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-4-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-4-quads.sparql
new file mode 100644
index 00000000..0b2b5851
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-4-quads.sparql
@@ -0,0 +1 @@
+MOVE DEFAULT TO GRAPH <http://example.org/named>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-5-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-5-quads.sparql
new file mode 100644
index 00000000..508c663b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql11-query/update/sparql-update-3-2-5-quads.sparql
@@ -0,0 +1 @@
+ADD DEFAULT TO GRAPH <http://example.org/named>
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-ar-langdir-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-ar-langdir-quads.sparql
new file mode 100644
index 00000000..96788ced
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-ar-langdir-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?p ?s WHERE {
+  ?s ?p "مرحبا"@ar--rtl .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-ar-langdir.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-ar-langdir.sparql
index 8269361b..96788ced 100644
--- a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-ar-langdir.sparql
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-ar-langdir.sparql
@@ -1,3 +1,3 @@
 SELECT ?p ?s WHERE {
   ?s ?p "مرحبا"@ar--rtl .
-}
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-en-langdir-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-en-langdir-quads.sparql
new file mode 100644
index 00000000..121057eb
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-en-langdir-quads.sparql
@@ -0,0 +1,3 @@
+SELECT ?p ?s WHERE {
+  ?s ?p "hello"@en--ltr .
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-en-langdir.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-en-langdir.sparql
index 76ecd7d7..121057eb 100644
--- a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-en-langdir.sparql
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql12/sparql-1-2-en-langdir.sparql
@@ -1,3 +1,3 @@
 SELECT ?p ?s WHERE {
   ?s ?p "hello"@en--ltr .
-}
+}
\ No newline at end of file

From b753b6963e3767002611e807025985b3883b334b Mon Sep 17 00:00:00 2001
From: Jitse De Smet <jitse@reedonk8.be>
Date: Thu, 7 May 2026 17:01:02 +0200
Subject: [PATCH 3/4] Add extra test

---
 .../delete/delete-with-03-quads.json          | 70 ++++++++++++++++
 .../sparql-1.1/delete/delete-with-03.json     | 84 +++++++++++++++++++
 .../delete/delete-with-03-quads.json          | 70 ++++++++++++++++
 .../sparql-1.1/delete/delete-with-03.json     | 84 +++++++++++++++++++
 .../delete/delete-with-03-quads.sparql        | 11 +++
 .../sparql-1.1/delete/delete-with-03.sparql   | 13 +++
 .../delete/delete-with-03-quads.sparql        | 11 +++
 .../sparql-1.1/delete/delete-with-03.sparql   | 13 +++
 .../sparql-1.1/delete/delete-with-03.sparql   | 13 +++
 9 files changed, 369 insertions(+)
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-03.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-03-quads.json
 create mode 100644 packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-03.json
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-03.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-03-quads.sparql
 create mode 100644 packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-03.sparql
 create mode 100644 packages/test-utils/statics/algebra/sparql/sparql-1.1/delete/delete-with-03.sparql

diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-03-quads.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-03-quads.json
new file mode 100644
index 00000000..2d8afb2a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-03-quads.json
@@ -0,0 +1,70 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g2"
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/knows"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.org/g1"
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.org/g1"
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-03.json b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-03.json
new file mode 100644
index 00000000..fc02d376
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra-blank-to-var/sparql-1.1/delete/delete-with-03.json
@@ -0,0 +1,84 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g2"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "graph",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://xmlns.com/foaf/0.1/knows"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "name": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g1"
+      }
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example.org/g2"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-03-quads.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-03-quads.json
new file mode 100644
index 00000000..2d8afb2a
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-03-quads.json
@@ -0,0 +1,70 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g2"
+      }
+    }
+  ],
+  "where": {
+    "type": "bgp",
+    "patterns": [
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "NamedNode",
+          "value": "http://example.org/a"
+        },
+        "predicate": {
+          "termType": "NamedNode",
+          "value": "http://xmlns.com/foaf/0.1/knows"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.org/g1"
+        }
+      },
+      {
+        "type": "pattern",
+        "termType": "Quad",
+        "subject": {
+          "termType": "Variable",
+          "value": "s"
+        },
+        "predicate": {
+          "termType": "Variable",
+          "value": "p"
+        },
+        "object": {
+          "termType": "Variable",
+          "value": "o"
+        },
+        "graph": {
+          "termType": "NamedNode",
+          "value": "http://example.org/g1"
+        }
+      }
+    ]
+  }
+}
diff --git a/packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-03.json b/packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-03.json
new file mode 100644
index 00000000..fc02d376
--- /dev/null
+++ b/packages/test-utils/statics/algebra/algebra/sparql-1.1/delete/delete-with-03.json
@@ -0,0 +1,84 @@
+{
+  "type": "deleteinsert",
+  "delete": [
+    {
+      "type": "pattern",
+      "termType": "Quad",
+      "subject": {
+        "termType": "Variable",
+        "value": "s"
+      },
+      "predicate": {
+        "termType": "Variable",
+        "value": "p"
+      },
+      "object": {
+        "termType": "Variable",
+        "value": "o"
+      },
+      "graph": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g2"
+      }
+    }
+  ],
+  "where": {
+    "type": "graph",
+    "input": {
+      "type": "graph",
+      "input": {
+        "type": "bgp",
+        "patterns": [
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "NamedNode",
+              "value": "http://example.org/a"
+            },
+            "predicate": {
+              "termType": "NamedNode",
+              "value": "http://xmlns.com/foaf/0.1/knows"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          },
+          {
+            "type": "pattern",
+            "termType": "Quad",
+            "subject": {
+              "termType": "Variable",
+              "value": "s"
+            },
+            "predicate": {
+              "termType": "Variable",
+              "value": "p"
+            },
+            "object": {
+              "termType": "Variable",
+              "value": "o"
+            },
+            "graph": {
+              "termType": "DefaultGraph",
+              "value": ""
+            }
+          }
+        ]
+      },
+      "name": {
+        "termType": "NamedNode",
+        "value": "http://example.org/g1"
+      }
+    },
+    "name": {
+      "termType": "NamedNode",
+      "value": "http://example.org/g2"
+    }
+  }
+}
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-03-quads.sparql
new file mode 100644
index 00000000..313ea4f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-03-quads.sparql
@@ -0,0 +1,11 @@
+DELETE {
+  GRAPH <http://example.org/g2> {
+    ?s ?p ?o .
+  }
+}
+WHERE {
+  GRAPH <http://example.org/g1> {
+    <http://example.org/a> <http://xmlns.com/foaf/0.1/knows> ?s .
+    ?s ?p ?o .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-03.sparql b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-03.sparql
new file mode 100644
index 00000000..18a7bc4f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/base/sparql-1.1/delete/delete-with-03.sparql
@@ -0,0 +1,13 @@
+DELETE {
+  GRAPH <http://example.org/g2> {
+    ?s ?p ?o .
+  }
+}
+WHERE {
+  GRAPH <http://example.org/g2> {
+    GRAPH <http://example.org/g1> {
+      <http://example.org/a> <http://xmlns.com/foaf/0.1/knows> ?s .
+      ?s ?p ?o .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-03-quads.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-03-quads.sparql
new file mode 100644
index 00000000..313ea4f6
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-03-quads.sparql
@@ -0,0 +1,11 @@
+DELETE {
+  GRAPH <http://example.org/g2> {
+    ?s ?p ?o .
+  }
+}
+WHERE {
+  GRAPH <http://example.org/g1> {
+    <http://example.org/a> <http://xmlns.com/foaf/0.1/knows> ?s .
+    ?s ?p ?o .
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-03.sparql b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-03.sparql
new file mode 100644
index 00000000..18a7bc4f
--- /dev/null
+++ b/packages/test-utils/statics/algebra/canonical-sparql/blank-to-var/sparql-1.1/delete/delete-with-03.sparql
@@ -0,0 +1,13 @@
+DELETE {
+  GRAPH <http://example.org/g2> {
+    ?s ?p ?o .
+  }
+}
+WHERE {
+  GRAPH <http://example.org/g2> {
+    GRAPH <http://example.org/g1> {
+      <http://example.org/a> <http://xmlns.com/foaf/0.1/knows> ?s .
+      ?s ?p ?o .
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/test-utils/statics/algebra/sparql/sparql-1.1/delete/delete-with-03.sparql b/packages/test-utils/statics/algebra/sparql/sparql-1.1/delete/delete-with-03.sparql
new file mode 100644
index 00000000..27592a5b
--- /dev/null
+++ b/packages/test-utils/statics/algebra/sparql/sparql-1.1/delete/delete-with-03.sparql
@@ -0,0 +1,13 @@
+PREFIX     : <http://example.org/>
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+
+WITH <http://example.org/g2>
+DELETE
+{
+  ?s ?p ?o
+}
+WHERE
+{
+  GRAPH <http://example.org/g1> { :a foaf:knows ?s .
+                                  ?s ?p ?o }
+}

From cc38d5eef8b840e155c7dd61623bacc64677504a Mon Sep 17 00:00:00 2001
From: Jitse De Smet <jitse@reedonk8.be>
Date: Thu, 7 May 2026 17:37:13 +0200
Subject: [PATCH 4/4] add jsdocs of quads option

---
 engines/algebra-sparql-1-1/README.md          | 3 ++-
 engines/algebra-sparql-1-1/lib/toAlgebra.ts   | 3 ++-
 engines/algebra-sparql-1-2/lib/toAlgebra12.ts | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/engines/algebra-sparql-1-1/README.md b/engines/algebra-sparql-1-1/README.md
index 5c04c971..5065fbaa 100644
--- a/engines/algebra-sparql-1-1/README.md
+++ b/engines/algebra-sparql-1-1/README.md
@@ -119,6 +119,7 @@ indicating whether patterns should be translated to triple or quad patterns.
 In the case of quads the `graph` operation will be removed
 and embedded into the patterns it contained.
 The default value for this parameter is `false`.
+For update queries, even in the case of `quad: false`, the target triple patterns are converted to quads.
 ```
 PREFIX : <http://www.example.org/>
 
@@ -252,4 +253,4 @@ and the project operation always gets used (even in the case of `SELECT *`).
 ## A note on tests
 
 Every test consists of a sparql file and a corresponding json file containing the algebra result.
-Tests ending with `(quads)` in their name are tested/generated with `quads: true` in the options.
+Tests ending with `-quads` in their name are tested/generated with `quads: true` in the options.
diff --git a/engines/algebra-sparql-1-1/lib/toAlgebra.ts b/engines/algebra-sparql-1-1/lib/toAlgebra.ts
index e089fa32..4147590e 100644
--- a/engines/algebra-sparql-1-1/lib/toAlgebra.ts
+++ b/engines/algebra-sparql-1-1/lib/toAlgebra.ts
@@ -97,7 +97,8 @@ export const toAlgebra11Builder = IndirBuilder
  * @param options - Optional options object. Current options:
  * @param options.dataFactory - The Datafactory used to generate terms. Default @rdfjs/data-model.
  * @param options.quads - Boolean indicating whether triples should be converted to Quads
- *        (consumes GRAPH statements). Default false.
+ *        (consuming the GRAPH statements).
+ *        Default false. - In case of false, graph targets of updates are still pushed down
  * @param options.prefixes - Pre-defined prefixes for the given query. Default empty.
  * @param options.baseIRI - Base IRI that should be used for the query.
  *        Default undefined (throws error if required).
diff --git a/engines/algebra-sparql-1-2/lib/toAlgebra12.ts b/engines/algebra-sparql-1-2/lib/toAlgebra12.ts
index 0fa248ce..d2b74cbe 100644
--- a/engines/algebra-sparql-1-2/lib/toAlgebra12.ts
+++ b/engines/algebra-sparql-1-2/lib/toAlgebra12.ts
@@ -120,7 +120,8 @@ export const toAlgebra12Builder = IndirBuilder
  * @param options - Optional options object. Current options:
  * @param options.dataFactory - The Datafactory used to generate terms. Default @rdfjs/data-model.
  * @param options.quads - Boolean indicating whether triples should be converted to Quads
- *        (consumes GRAPH statements). Default false.
+ *       (consuming the GRAPH statements).
+ *        Default false. - In case of false, graph targets of updates are still pushed down
  * @param options.prefixes - Pre-defined prefixes for the given query. Default empty.
  * @param options.baseIRI - Base IRI that should be used for the query.
  *        Default undefined (throws error if required).