tests: Rename libtracker-data tests to 'core'

Abandon the static library name for these tests.

924 files changed, 20 insertions, 20 deletions

diff --git a/tests/libtracker-data/.gitignore b/tests/core/.gitignore
index 47f150f24..47f150f24 100644
--- a/tests/libtracker-data/.gitignore
+++ b/tests/core/.gitignore
diff --git a/tests/libtracker-data/aggregates/aggregate-1.out b/tests/core/aggregates/aggregate-1.out
index 8ea62e7c8..8ea62e7c8 100644
--- a/tests/libtracker-data/aggregates/aggregate-1.out
+++ b/tests/core/aggregates/aggregate-1.out
diff --git a/tests/libtracker-data/aggregates/aggregate-1.rq b/tests/core/aggregates/aggregate-1.rq
index b9aee27b2..b9aee27b2 100755
--- a/tests/libtracker-data/aggregates/aggregate-1.rq
+++ b/tests/core/aggregates/aggregate-1.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-count-1.out b/tests/core/aggregates/aggregate-count-1.out
index 18d17df02..18d17df02 100644
--- a/tests/libtracker-data/aggregates/aggregate-count-1.out
+++ b/tests/core/aggregates/aggregate-count-1.out
diff --git a/tests/libtracker-data/aggregates/aggregate-count-1.rq b/tests/core/aggregates/aggregate-count-1.rq
index dbdb24acf..dbdb24acf 100644
--- a/tests/libtracker-data/aggregates/aggregate-count-1.rq
+++ b/tests/core/aggregates/aggregate-count-1.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-count-2.out b/tests/core/aggregates/aggregate-count-2.out
index 18d17df02..18d17df02 100644
--- a/tests/libtracker-data/aggregates/aggregate-count-2.out
+++ b/tests/core/aggregates/aggregate-count-2.out
diff --git a/tests/libtracker-data/aggregates/aggregate-count-2.rq b/tests/core/aggregates/aggregate-count-2.rq
index dd440145d..dd440145d 100644
--- a/tests/libtracker-data/aggregates/aggregate-count-2.rq
+++ b/tests/core/aggregates/aggregate-count-2.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-count-3.out b/tests/core/aggregates/aggregate-count-3.out
index 1026c253e..1026c253e 100644
--- a/tests/libtracker-data/aggregates/aggregate-count-3.out
+++ b/tests/core/aggregates/aggregate-count-3.out
diff --git a/tests/libtracker-data/aggregates/aggregate-count-3.rq b/tests/core/aggregates/aggregate-count-3.rq
index 73a072b8a..73a072b8a 100644
--- a/tests/libtracker-data/aggregates/aggregate-count-3.rq
+++ b/tests/core/aggregates/aggregate-count-3.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-distinct-1.out b/tests/core/aggregates/aggregate-distinct-1.out
index e5cb99d04..e5cb99d04 100644
--- a/tests/libtracker-data/aggregates/aggregate-distinct-1.out
+++ b/tests/core/aggregates/aggregate-distinct-1.out
diff --git a/tests/libtracker-data/aggregates/aggregate-distinct-1.rq b/tests/core/aggregates/aggregate-distinct-1.rq
index 336392020..336392020 100755
--- a/tests/libtracker-data/aggregates/aggregate-distinct-1.rq
+++ b/tests/core/aggregates/aggregate-distinct-1.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-group-1.out b/tests/core/aggregates/aggregate-group-1.out
index 3b41f134b..3b41f134b 100644
--- a/tests/libtracker-data/aggregates/aggregate-group-1.out
+++ b/tests/core/aggregates/aggregate-group-1.out
diff --git a/tests/libtracker-data/aggregates/aggregate-group-1.rq b/tests/core/aggregates/aggregate-group-1.rq
index d57821a33..d57821a33 100755
--- a/tests/libtracker-data/aggregates/aggregate-group-1.rq
+++ b/tests/core/aggregates/aggregate-group-1.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-group-2.out b/tests/core/aggregates/aggregate-group-2.out
index 3b41f134b..3b41f134b 100644
--- a/tests/libtracker-data/aggregates/aggregate-group-2.out
+++ b/tests/core/aggregates/aggregate-group-2.out
diff --git a/tests/libtracker-data/aggregates/aggregate-group-2.rq b/tests/core/aggregates/aggregate-group-2.rq
index ece4a0bd9..ece4a0bd9 100644
--- a/tests/libtracker-data/aggregates/aggregate-group-2.rq
+++ b/tests/core/aggregates/aggregate-group-2.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-group-3.out b/tests/core/aggregates/aggregate-group-3.out
index 3b41f134b..3b41f134b 100644
--- a/tests/libtracker-data/aggregates/aggregate-group-3.out
+++ b/tests/core/aggregates/aggregate-group-3.out
diff --git a/tests/libtracker-data/aggregates/aggregate-group-3.rq b/tests/core/aggregates/aggregate-group-3.rq
index 440dceaf9..440dceaf9 100644
--- a/tests/libtracker-data/aggregates/aggregate-group-3.rq
+++ b/tests/core/aggregates/aggregate-group-3.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-group-as-1.out b/tests/core/aggregates/aggregate-group-as-1.out
index 3b41f134b..3b41f134b 100644
--- a/tests/libtracker-data/aggregates/aggregate-group-as-1.out
+++ b/tests/core/aggregates/aggregate-group-as-1.out
diff --git a/tests/libtracker-data/aggregates/aggregate-group-as-1.rq b/tests/core/aggregates/aggregate-group-as-1.rq
index dacf6b30e..dacf6b30e 100644
--- a/tests/libtracker-data/aggregates/aggregate-group-as-1.rq
+++ b/tests/core/aggregates/aggregate-group-as-1.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-group-having-1.out b/tests/core/aggregates/aggregate-group-having-1.out
index e66f8d307..e66f8d307 100644
--- a/tests/libtracker-data/aggregates/aggregate-group-having-1.out
+++ b/tests/core/aggregates/aggregate-group-having-1.out
diff --git a/tests/libtracker-data/aggregates/aggregate-group-having-1.rq b/tests/core/aggregates/aggregate-group-having-1.rq
index c8dc7bef8..c8dc7bef8 100644
--- a/tests/libtracker-data/aggregates/aggregate-group-having-1.rq
+++ b/tests/core/aggregates/aggregate-group-having-1.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-sample-1.out b/tests/core/aggregates/aggregate-sample-1.out
index 5378d4f58..5378d4f58 100644
--- a/tests/libtracker-data/aggregates/aggregate-sample-1.out
+++ b/tests/core/aggregates/aggregate-sample-1.out
diff --git a/tests/libtracker-data/aggregates/aggregate-sample-1.rq b/tests/core/aggregates/aggregate-sample-1.rq
index 08d142806..08d142806 100644
--- a/tests/libtracker-data/aggregates/aggregate-sample-1.rq
+++ b/tests/core/aggregates/aggregate-sample-1.rq
diff --git a/tests/libtracker-data/aggregates/aggregate-sample-2.out b/tests/core/aggregates/aggregate-sample-2.out
index 5378d4f58..5378d4f58 100644
--- a/tests/libtracker-data/aggregates/aggregate-sample-2.out
+++ b/tests/core/aggregates/aggregate-sample-2.out
diff --git a/tests/libtracker-data/aggregates/aggregate-sample-2.rq b/tests/core/aggregates/aggregate-sample-2.rq
index c95554179..c95554179 100644
--- a/tests/libtracker-data/aggregates/aggregate-sample-2.rq
+++ b/tests/core/aggregates/aggregate-sample-2.rq
diff --git a/tests/libtracker-data/aggregates/data-1.ttl b/tests/core/aggregates/data-1.ttl
index e06455e28..e06455e28 100755
--- a/tests/libtracker-data/aggregates/data-1.ttl
+++ b/tests/core/aggregates/data-1.ttl
diff --git a/tests/libtracker-data/aggregates/test.ontology b/tests/core/aggregates/test.ontology
index cc33f80ff..cc33f80ff 100644
--- a/tests/libtracker-data/aggregates/test.ontology
+++ b/tests/core/aggregates/test.ontology
diff --git a/tests/libtracker-data/algebra/data-1.ttl b/tests/core/algebra/data-1.ttl
index 4ce15fca8..4ce15fca8 100644
--- a/tests/libtracker-data/algebra/data-1.ttl
+++ b/tests/core/algebra/data-1.ttl
diff --git a/tests/libtracker-data/algebra/data-2.ttl b/tests/core/algebra/data-2.ttl
index a2cb94bd7..a2cb94bd7 100644
--- a/tests/libtracker-data/algebra/data-2.ttl
+++ b/tests/core/algebra/data-2.ttl
diff --git a/tests/libtracker-data/algebra/filter-in-1.out b/tests/core/algebra/filter-in-1.out
index f27b76c59..f27b76c59 100644
--- a/tests/libtracker-data/algebra/filter-in-1.out
+++ b/tests/core/algebra/filter-in-1.out
diff --git a/tests/libtracker-data/algebra/filter-in-1.rq b/tests/core/algebra/filter-in-1.rq
index 59e7b1e2f..59e7b1e2f 100644
--- a/tests/libtracker-data/algebra/filter-in-1.rq
+++ b/tests/core/algebra/filter-in-1.rq
diff --git a/tests/libtracker-data/algebra/filter-in-2.out b/tests/core/algebra/filter-in-2.out
index 55702eba1..55702eba1 100644
--- a/tests/libtracker-data/algebra/filter-in-2.out
+++ b/tests/core/algebra/filter-in-2.out
diff --git a/tests/libtracker-data/algebra/filter-in-2.rq b/tests/core/algebra/filter-in-2.rq
index 26669a76c..26669a76c 100644
--- a/tests/libtracker-data/algebra/filter-in-2.rq
+++ b/tests/core/algebra/filter-in-2.rq
diff --git a/tests/libtracker-data/algebra/filter-in-3.out b/tests/core/algebra/filter-in-3.out
index bee50b473..bee50b473 100644
--- a/tests/libtracker-data/algebra/filter-in-3.out
+++ b/tests/core/algebra/filter-in-3.out
diff --git a/tests/libtracker-data/algebra/filter-in-3.rq b/tests/core/algebra/filter-in-3.rq
index 11d39f0a4..11d39f0a4 100644
--- a/tests/libtracker-data/algebra/filter-in-3.rq
+++ b/tests/core/algebra/filter-in-3.rq
diff --git a/tests/libtracker-data/algebra/filter-in-4.out b/tests/core/algebra/filter-in-4.out
index bee50b473..bee50b473 100644
--- a/tests/libtracker-data/algebra/filter-in-4.out
+++ b/tests/core/algebra/filter-in-4.out
diff --git a/tests/libtracker-data/algebra/filter-in-4.rq b/tests/core/algebra/filter-in-4.rq
index 883045e77..883045e77 100644
--- a/tests/libtracker-data/algebra/filter-in-4.rq
+++ b/tests/core/algebra/filter-in-4.rq
diff --git a/tests/libtracker-data/algebra/filter-in-5.out b/tests/core/algebra/filter-in-5.out
index a4cff3655..a4cff3655 100644
--- a/tests/libtracker-data/algebra/filter-in-5.out
+++ b/tests/core/algebra/filter-in-5.out
diff --git a/tests/libtracker-data/algebra/filter-in-5.rq b/tests/core/algebra/filter-in-5.rq
index e9470bfbb..e9470bfbb 100644
--- a/tests/libtracker-data/algebra/filter-in-5.rq
+++ b/tests/core/algebra/filter-in-5.rq
diff --git a/tests/libtracker-data/algebra/filter-nested-1.out b/tests/core/algebra/filter-nested-1.out
index f27b76c59..f27b76c59 100644
--- a/tests/libtracker-data/algebra/filter-nested-1.out
+++ b/tests/core/algebra/filter-nested-1.out
diff --git a/tests/libtracker-data/algebra/filter-nested-1.rq b/tests/core/algebra/filter-nested-1.rq
index 78f28533c..78f28533c 100644
--- a/tests/libtracker-data/algebra/filter-nested-1.rq
+++ b/tests/core/algebra/filter-nested-1.rq
diff --git a/tests/libtracker-data/algebra/filter-nested-2.out b/tests/core/algebra/filter-nested-2.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/algebra/filter-nested-2.out
+++ b/tests/core/algebra/filter-nested-2.out
diff --git a/tests/libtracker-data/algebra/filter-nested-2.rq b/tests/core/algebra/filter-nested-2.rq
index 8430cef61..8430cef61 100644
--- a/tests/libtracker-data/algebra/filter-nested-2.rq
+++ b/tests/core/algebra/filter-nested-2.rq
diff --git a/tests/libtracker-data/algebra/filter-placement-1.out b/tests/core/algebra/filter-placement-1.out
index 1026c253e..1026c253e 100644
--- a/tests/libtracker-data/algebra/filter-placement-1.out
+++ b/tests/core/algebra/filter-placement-1.out
diff --git a/tests/libtracker-data/algebra/filter-placement-1.rq b/tests/core/algebra/filter-placement-1.rq
index 804048192..804048192 100644
--- a/tests/libtracker-data/algebra/filter-placement-1.rq
+++ b/tests/core/algebra/filter-placement-1.rq
diff --git a/tests/libtracker-data/algebra/filter-placement-2.out b/tests/core/algebra/filter-placement-2.out
index 1026c253e..1026c253e 100644
--- a/tests/libtracker-data/algebra/filter-placement-2.out
+++ b/tests/core/algebra/filter-placement-2.out
diff --git a/tests/libtracker-data/algebra/filter-placement-2.rq b/tests/core/algebra/filter-placement-2.rq
index c6ee4cf0e..c6ee4cf0e 100644
--- a/tests/libtracker-data/algebra/filter-placement-2.rq
+++ b/tests/core/algebra/filter-placement-2.rq
diff --git a/tests/libtracker-data/algebra/filter-placement-3.out b/tests/core/algebra/filter-placement-3.out
index e631bb342..e631bb342 100644
--- a/tests/libtracker-data/algebra/filter-placement-3.out
+++ b/tests/core/algebra/filter-placement-3.out
diff --git a/tests/libtracker-data/algebra/filter-placement-3.rq b/tests/core/algebra/filter-placement-3.rq
index 57f17677b..57f17677b 100644
--- a/tests/libtracker-data/algebra/filter-placement-3.rq
+++ b/tests/core/algebra/filter-placement-3.rq
diff --git a/tests/libtracker-data/algebra/filter-placement-3a.out b/tests/core/algebra/filter-placement-3a.out
index e631bb342..e631bb342 100644
--- a/tests/libtracker-data/algebra/filter-placement-3a.out
+++ b/tests/core/algebra/filter-placement-3a.out
diff --git a/tests/libtracker-data/algebra/filter-placement-3a.rq b/tests/core/algebra/filter-placement-3a.rq
index d79eddd41..d79eddd41 100644
--- a/tests/libtracker-data/algebra/filter-placement-3a.rq
+++ b/tests/core/algebra/filter-placement-3a.rq
diff --git a/tests/libtracker-data/algebra/filter-scope-1.out b/tests/core/algebra/filter-scope-1.out
index c88c6b124..c88c6b124 100644
--- a/tests/libtracker-data/algebra/filter-scope-1.out
+++ b/tests/core/algebra/filter-scope-1.out
diff --git a/tests/libtracker-data/algebra/filter-scope-1.rq b/tests/core/algebra/filter-scope-1.rq
index 7ee5a24ad..7ee5a24ad 100644
--- a/tests/libtracker-data/algebra/filter-scope-1.rq
+++ b/tests/core/algebra/filter-scope-1.rq
diff --git a/tests/libtracker-data/algebra/modifier-limit-1.out b/tests/core/algebra/modifier-limit-1.out
index f27b76c59..f27b76c59 100644
--- a/tests/libtracker-data/algebra/modifier-limit-1.out
+++ b/tests/core/algebra/modifier-limit-1.out
diff --git a/tests/libtracker-data/algebra/modifier-limit-1.rq b/tests/core/algebra/modifier-limit-1.rq
index 2d0e3b986..2d0e3b986 100644
--- a/tests/libtracker-data/algebra/modifier-limit-1.rq
+++ b/tests/core/algebra/modifier-limit-1.rq
diff --git a/tests/libtracker-data/algebra/modifier-limit-offset-1.out b/tests/core/algebra/modifier-limit-offset-1.out
index 1026c253e..1026c253e 100644
--- a/tests/libtracker-data/algebra/modifier-limit-offset-1.out
+++ b/tests/core/algebra/modifier-limit-offset-1.out
diff --git a/tests/libtracker-data/algebra/modifier-limit-offset-1.rq b/tests/core/algebra/modifier-limit-offset-1.rq
index 5a60710b4..5a60710b4 100644
--- a/tests/libtracker-data/algebra/modifier-limit-offset-1.rq
+++ b/tests/core/algebra/modifier-limit-offset-1.rq
diff --git a/tests/libtracker-data/algebra/modifier-limit-offset-2.out b/tests/core/algebra/modifier-limit-offset-2.out
index 1026c253e..1026c253e 100644
--- a/tests/libtracker-data/algebra/modifier-limit-offset-2.out
+++ b/tests/core/algebra/modifier-limit-offset-2.out
diff --git a/tests/libtracker-data/algebra/modifier-limit-offset-2.rq b/tests/core/algebra/modifier-limit-offset-2.rq
index 83aefe64e..83aefe64e 100644
--- a/tests/libtracker-data/algebra/modifier-limit-offset-2.rq
+++ b/tests/core/algebra/modifier-limit-offset-2.rq
diff --git a/tests/libtracker-data/algebra/modifier-offset-1.out b/tests/core/algebra/modifier-offset-1.out
index f1861d764..f1861d764 100644
--- a/tests/libtracker-data/algebra/modifier-offset-1.out
+++ b/tests/core/algebra/modifier-offset-1.out
diff --git a/tests/libtracker-data/algebra/modifier-offset-1.rq b/tests/core/algebra/modifier-offset-1.rq
index 3059b418a..3059b418a 100644
--- a/tests/libtracker-data/algebra/modifier-offset-1.rq
+++ b/tests/core/algebra/modifier-offset-1.rq
diff --git a/tests/libtracker-data/algebra/opt-filter-3.out b/tests/core/algebra/opt-filter-3.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/algebra/opt-filter-3.out
+++ b/tests/core/algebra/opt-filter-3.out
diff --git a/tests/libtracker-data/algebra/opt-filter-3.rq b/tests/core/algebra/opt-filter-3.rq
index 9031586f9..9031586f9 100644
--- a/tests/libtracker-data/algebra/opt-filter-3.rq
+++ b/tests/core/algebra/opt-filter-3.rq
diff --git a/tests/libtracker-data/algebra/opt-filter-3.ttl b/tests/core/algebra/opt-filter-3.ttl
index 76a16ac1e..76a16ac1e 100644
--- a/tests/libtracker-data/algebra/opt-filter-3.ttl
+++ b/tests/core/algebra/opt-filter-3.ttl
diff --git a/tests/libtracker-data/algebra/test-1.ontology b/tests/core/algebra/test-1.ontology
index 215735a70..215735a70 100644
--- a/tests/libtracker-data/algebra/test-1.ontology
+++ b/tests/core/algebra/test-1.ontology
diff --git a/tests/libtracker-data/algebra/test-2.ontology b/tests/core/algebra/test-2.ontology
index c95cdb416..c95cdb416 100644
--- a/tests/libtracker-data/algebra/test-2.ontology
+++ b/tests/core/algebra/test-2.ontology
diff --git a/tests/libtracker-data/algebra/two-nested-opt-alt.out b/tests/core/algebra/two-nested-opt-alt.out
index 18ba95897..18ba95897 100644
--- a/tests/libtracker-data/algebra/two-nested-opt-alt.out
+++ b/tests/core/algebra/two-nested-opt-alt.out
diff --git a/tests/libtracker-data/algebra/two-nested-opt-alt.rq b/tests/core/algebra/two-nested-opt-alt.rq
index 82125a298..82125a298 100644
--- a/tests/libtracker-data/algebra/two-nested-opt-alt.rq
+++ b/tests/core/algebra/two-nested-opt-alt.rq
diff --git a/tests/libtracker-data/algebra/two-nested-opt.out b/tests/core/algebra/two-nested-opt.out
index e5942c200..e5942c200 100644
--- a/tests/libtracker-data/algebra/two-nested-opt.out
+++ b/tests/core/algebra/two-nested-opt.out
diff --git a/tests/libtracker-data/algebra/two-nested-opt.rq b/tests/core/algebra/two-nested-opt.rq
index 39d351b2d..39d351b2d 100644
--- a/tests/libtracker-data/algebra/two-nested-opt.rq
+++ b/tests/core/algebra/two-nested-opt.rq
diff --git a/tests/libtracker-data/algebra/two-nested-opt.ttl b/tests/core/algebra/two-nested-opt.ttl
index 2e658fb6b..2e658fb6b 100644
--- a/tests/libtracker-data/algebra/two-nested-opt.ttl
+++ b/tests/core/algebra/two-nested-opt.ttl
diff --git a/tests/libtracker-data/algebra/var-scope-join-1.out b/tests/core/algebra/var-scope-join-1.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/algebra/var-scope-join-1.out
+++ b/tests/core/algebra/var-scope-join-1.out
diff --git a/tests/libtracker-data/algebra/var-scope-join-1.rq b/tests/core/algebra/var-scope-join-1.rq
index fa856a4da..fa856a4da 100644
--- a/tests/libtracker-data/algebra/var-scope-join-1.rq
+++ b/tests/core/algebra/var-scope-join-1.rq
diff --git a/tests/libtracker-data/algebra/var-scope-join-1.ttl b/tests/core/algebra/var-scope-join-1.ttl
index 9a177f08f..9a177f08f 100644
--- a/tests/libtracker-data/algebra/var-scope-join-1.ttl
+++ b/tests/core/algebra/var-scope-join-1.ttl
diff --git a/tests/libtracker-data/anon/data.ttl b/tests/core/anon/data.ttl
index 5088a80d3..5088a80d3 100755
--- a/tests/libtracker-data/anon/data.ttl
+++ b/tests/core/anon/data.ttl
diff --git a/tests/libtracker-data/anon/query-2.out b/tests/core/anon/query-2.out
index f27b76c59..f27b76c59 100644
--- a/tests/libtracker-data/anon/query-2.out
+++ b/tests/core/anon/query-2.out
diff --git a/tests/libtracker-data/anon/query-2.rq b/tests/core/anon/query-2.rq
index 4ea5f5ae2..4ea5f5ae2 100644
--- a/tests/libtracker-data/anon/query-2.rq
+++ b/tests/core/anon/query-2.rq
diff --git a/tests/libtracker-data/anon/query-3.out b/tests/core/anon/query-3.out
index fe1e48f34..fe1e48f34 100644
--- a/tests/libtracker-data/anon/query-3.out
+++ b/tests/core/anon/query-3.out
diff --git a/tests/libtracker-data/anon/query-3.rq b/tests/core/anon/query-3.rq
index ba9252f0b..ba9252f0b 100644
--- a/tests/libtracker-data/anon/query-3.rq
+++ b/tests/core/anon/query-3.rq
diff --git a/tests/libtracker-data/anon/query-4.out b/tests/core/anon/query-4.out
index 3970b1c89..3970b1c89 100644
--- a/tests/libtracker-data/anon/query-4.out
+++ b/tests/core/anon/query-4.out
diff --git a/tests/libtracker-data/anon/query-4.rq b/tests/core/anon/query-4.rq
index 772c1bf8c..772c1bf8c 100644
--- a/tests/libtracker-data/anon/query-4.rq
+++ b/tests/core/anon/query-4.rq
diff --git a/tests/libtracker-data/anon/query-5.out b/tests/core/anon/query-5.out
index a0dc77220..a0dc77220 100644
--- a/tests/libtracker-data/anon/query-5.out
+++ b/tests/core/anon/query-5.out
diff --git a/tests/libtracker-data/anon/query-5.rq b/tests/core/anon/query-5.rq
index 2f3df0ad5..2f3df0ad5 100644
--- a/tests/libtracker-data/anon/query-5.rq
+++ b/tests/core/anon/query-5.rq
diff --git a/tests/libtracker-data/anon/query.out b/tests/core/anon/query.out
index c6ccd83de..c6ccd83de 100755
--- a/tests/libtracker-data/anon/query.out
+++ b/tests/core/anon/query.out
diff --git a/tests/libtracker-data/anon/query.rq b/tests/core/anon/query.rq
index 07d997223..07d997223 100755
--- a/tests/libtracker-data/anon/query.rq
+++ b/tests/core/anon/query.rq
diff --git a/tests/libtracker-data/anon/test.ontology b/tests/core/anon/test.ontology
index c9b1d07f4..c9b1d07f4 100644
--- a/tests/libtracker-data/anon/test.ontology
+++ b/tests/core/anon/test.ontology
diff --git a/tests/libtracker-data/ask/ask-1.out b/tests/core/ask/ask-1.out
index 826861551..826861551 100644
--- a/tests/libtracker-data/ask/ask-1.out
+++ b/tests/core/ask/ask-1.out
diff --git a/tests/libtracker-data/ask/ask-1.rq b/tests/core/ask/ask-1.rq
index 25f63cbe6..25f63cbe6 100644
--- a/tests/libtracker-data/ask/ask-1.rq
+++ b/tests/core/ask/ask-1.rq
diff --git a/tests/libtracker-data/ask/data.ontology b/tests/core/ask/data.ontology
index eb2fa58f2..eb2fa58f2 100644
--- a/tests/libtracker-data/ask/data.ontology
+++ b/tests/core/ask/data.ontology
diff --git a/tests/libtracker-data/ask/data.ttl b/tests/core/ask/data.ttl
index 41a361c3a..41a361c3a 100755
--- a/tests/libtracker-data/ask/data.ttl
+++ b/tests/core/ask/data.ttl
diff --git a/tests/libtracker-data/basic/base-1.out b/tests/core/basic/base-1.out
index 192548e94..192548e94 100644
--- a/tests/libtracker-data/basic/base-1.out
+++ b/tests/core/basic/base-1.out
diff --git a/tests/libtracker-data/basic/base-1.rq b/tests/core/basic/base-1.rq
index 4c51942e6..4c51942e6 100644
--- a/tests/libtracker-data/basic/base-1.rq
+++ b/tests/core/basic/base-1.rq
diff --git a/tests/libtracker-data/basic/base-prefix-3.out b/tests/core/basic/base-prefix-3.out
index 9782c57ca..9782c57ca 100755
--- a/tests/libtracker-data/basic/base-prefix-3.out
+++ b/tests/core/basic/base-prefix-3.out
diff --git a/tests/libtracker-data/basic/base-prefix-3.rq b/tests/core/basic/base-prefix-3.rq
index 67ea10911..67ea10911 100755
--- a/tests/libtracker-data/basic/base-prefix-3.rq
+++ b/tests/core/basic/base-prefix-3.rq
diff --git a/tests/libtracker-data/basic/codepoint-escaping.out b/tests/core/basic/codepoint-escaping.out
index d45173be6..d45173be6 100644
--- a/tests/libtracker-data/basic/codepoint-escaping.out
+++ b/tests/core/basic/codepoint-escaping.out
diff --git a/tests/libtracker-data/basic/codepoint-escaping.rq b/tests/core/basic/codepoint-escaping.rq
index 510e68d5b..510e68d5b 100644
--- a/tests/libtracker-data/basic/codepoint-escaping.rq
+++ b/tests/core/basic/codepoint-escaping.rq
diff --git a/tests/libtracker-data/basic/compare-cast.out b/tests/core/basic/compare-cast.out
index 826861551..826861551 100644
--- a/tests/libtracker-data/basic/compare-cast.out
+++ b/tests/core/basic/compare-cast.out
diff --git a/tests/libtracker-data/basic/compare-cast.rq b/tests/core/basic/compare-cast.rq
index f176883f2..f176883f2 100644
--- a/tests/libtracker-data/basic/compare-cast.rq
+++ b/tests/core/basic/compare-cast.rq
diff --git a/tests/libtracker-data/basic/data-1.ttl b/tests/core/basic/data-1.ttl
index 08e1add88..08e1add88 100755
--- a/tests/libtracker-data/basic/data-1.ttl
+++ b/tests/core/basic/data-1.ttl
diff --git a/tests/libtracker-data/basic/long-strings.out b/tests/core/basic/long-strings.out
index 28c6e7be9..28c6e7be9 100644
--- a/tests/libtracker-data/basic/long-strings.out
+++ b/tests/core/basic/long-strings.out
diff --git a/tests/libtracker-data/basic/long-strings.rq b/tests/core/basic/long-strings.rq
index 9b7abccf9..9b7abccf9 100644
--- a/tests/libtracker-data/basic/long-strings.rq
+++ b/tests/core/basic/long-strings.rq
diff --git a/tests/libtracker-data/basic/predicate-variable-2.out b/tests/core/basic/predicate-variable-2.out
index 48c4bd09d..48c4bd09d 100644
--- a/tests/libtracker-data/basic/predicate-variable-2.out
+++ b/tests/core/basic/predicate-variable-2.out
diff --git a/tests/libtracker-data/basic/predicate-variable-2.rq b/tests/core/basic/predicate-variable-2.rq
index 918654c41..918654c41 100644
--- a/tests/libtracker-data/basic/predicate-variable-2.rq
+++ b/tests/core/basic/predicate-variable-2.rq
diff --git a/tests/libtracker-data/basic/predicate-variable-3.out b/tests/core/basic/predicate-variable-3.out
index 508938b31..508938b31 100644
--- a/tests/libtracker-data/basic/predicate-variable-3.out
+++ b/tests/core/basic/predicate-variable-3.out
diff --git a/tests/libtracker-data/basic/predicate-variable-3.rq b/tests/core/basic/predicate-variable-3.rq
index cbb889e4e..cbb889e4e 100644
--- a/tests/libtracker-data/basic/predicate-variable-3.rq
+++ b/tests/core/basic/predicate-variable-3.rq
diff --git a/tests/libtracker-data/basic/predicate-variable-4.out b/tests/core/basic/predicate-variable-4.out
index bee7eaceb..bee7eaceb 100644
--- a/tests/libtracker-data/basic/predicate-variable-4.out
+++ b/tests/core/basic/predicate-variable-4.out
diff --git a/tests/libtracker-data/basic/predicate-variable-4.rq b/tests/core/basic/predicate-variable-4.rq
index e017b36ce..e017b36ce 100644
--- a/tests/libtracker-data/basic/predicate-variable-4.rq
+++ b/tests/core/basic/predicate-variable-4.rq
diff --git a/tests/libtracker-data/basic/predicate-variable.out b/tests/core/basic/predicate-variable.out
index 377c99482..377c99482 100644
--- a/tests/libtracker-data/basic/predicate-variable.out
+++ b/tests/core/basic/predicate-variable.out
diff --git a/tests/libtracker-data/basic/predicate-variable.rq b/tests/core/basic/predicate-variable.rq
index f1c25c454..f1c25c454 100644
--- a/tests/libtracker-data/basic/predicate-variable.rq
+++ b/tests/core/basic/predicate-variable.rq
diff --git a/tests/libtracker-data/basic/test.ontology b/tests/core/basic/test.ontology
index d1c0849a8..d1c0849a8 100644
--- a/tests/libtracker-data/basic/test.ontology
+++ b/tests/core/basic/test.ontology
diff --git a/tests/libtracker-data/basic/urn-in-as.out b/tests/core/basic/urn-in-as.out
index 906a7a15b..906a7a15b 100644
--- a/tests/libtracker-data/basic/urn-in-as.out
+++ b/tests/core/basic/urn-in-as.out
diff --git a/tests/libtracker-data/basic/urn-in-as.rq b/tests/core/basic/urn-in-as.rq
index e56504bf4..e56504bf4 100644
--- a/tests/libtracker-data/basic/urn-in-as.rq
+++ b/tests/core/basic/urn-in-as.rq
diff --git a/tests/libtracker-data/bind/bind-reused-different-patterns.out b/tests/core/bind/bind-reused-different-patterns.out
index e1c03aad4..e1c03aad4 100644
--- a/tests/libtracker-data/bind/bind-reused-different-patterns.out
+++ b/tests/core/bind/bind-reused-different-patterns.out
diff --git a/tests/libtracker-data/bind/bind-reused-different-patterns.rq b/tests/core/bind/bind-reused-different-patterns.rq
index 24a86d6b4..24a86d6b4 100644
--- a/tests/libtracker-data/bind/bind-reused-different-patterns.rq
+++ b/tests/core/bind/bind-reused-different-patterns.rq
diff --git a/tests/libtracker-data/bind/bind1.out b/tests/core/bind/bind1.out
index e6069faa6..e6069faa6 100644
--- a/tests/libtracker-data/bind/bind1.out
+++ b/tests/core/bind/bind1.out
diff --git a/tests/libtracker-data/bind/bind1.rq b/tests/core/bind/bind1.rq
index c27a3a1a8..c27a3a1a8 100644
--- a/tests/libtracker-data/bind/bind1.rq
+++ b/tests/core/bind/bind1.rq
diff --git a/tests/libtracker-data/bind/bind2.out b/tests/core/bind/bind2.out
index e89c3eae8..e89c3eae8 100644
--- a/tests/libtracker-data/bind/bind2.out
+++ b/tests/core/bind/bind2.out
diff --git a/tests/libtracker-data/bind/bind2.rq b/tests/core/bind/bind2.rq
index c22d7b129..c22d7b129 100644
--- a/tests/libtracker-data/bind/bind2.rq
+++ b/tests/core/bind/bind2.rq
diff --git a/tests/libtracker-data/bind/bind3.out b/tests/core/bind/bind3.out
index 77909cd6f..77909cd6f 100644
--- a/tests/libtracker-data/bind/bind3.out
+++ b/tests/core/bind/bind3.out
diff --git a/tests/libtracker-data/bind/bind3.rq b/tests/core/bind/bind3.rq
index 2d9405a8a..2d9405a8a 100644
--- a/tests/libtracker-data/bind/bind3.rq
+++ b/tests/core/bind/bind3.rq
diff --git a/tests/libtracker-data/bind/bind4.out b/tests/core/bind/bind4.out
index d9552295a..d9552295a 100644
--- a/tests/libtracker-data/bind/bind4.out
+++ b/tests/core/bind/bind4.out
diff --git a/tests/libtracker-data/bind/bind4.rq b/tests/core/bind/bind4.rq
index cb1081e3e..cb1081e3e 100644
--- a/tests/libtracker-data/bind/bind4.rq
+++ b/tests/core/bind/bind4.rq
diff --git a/tests/libtracker-data/bind/bind5.out b/tests/core/bind/bind5.out
index 192548e94..192548e94 100644
--- a/tests/libtracker-data/bind/bind5.out
+++ b/tests/core/bind/bind5.out
diff --git a/tests/libtracker-data/bind/bind5.rq b/tests/core/bind/bind5.rq
index 4207421be..4207421be 100644
--- a/tests/libtracker-data/bind/bind5.rq
+++ b/tests/core/bind/bind5.rq
diff --git a/tests/libtracker-data/bind/bind6.out b/tests/core/bind/bind6.out
index 9d35f19f2..9d35f19f2 100644
--- a/tests/libtracker-data/bind/bind6.out
+++ b/tests/core/bind/bind6.out
diff --git a/tests/libtracker-data/bind/bind6.rq b/tests/core/bind/bind6.rq
index 439d08aef..439d08aef 100644
--- a/tests/libtracker-data/bind/bind6.rq
+++ b/tests/core/bind/bind6.rq
diff --git a/tests/libtracker-data/bind/bind7.out b/tests/core/bind/bind7.out
index bf4e57471..bf4e57471 100644
--- a/tests/libtracker-data/bind/bind7.out
+++ b/tests/core/bind/bind7.out
diff --git a/tests/libtracker-data/bind/bind7.rq b/tests/core/bind/bind7.rq
index 50611a514..50611a514 100644
--- a/tests/libtracker-data/bind/bind7.rq
+++ b/tests/core/bind/bind7.rq
diff --git a/tests/libtracker-data/bind/data.ontology b/tests/core/bind/data.ontology
index dacbdce0a..dacbdce0a 100644
--- a/tests/libtracker-data/bind/data.ontology
+++ b/tests/core/bind/data.ontology
diff --git a/tests/libtracker-data/bind/data.ttl b/tests/core/bind/data.ttl
index 45d495b69..45d495b69 100644
--- a/tests/libtracker-data/bind/data.ttl
+++ b/tests/core/bind/data.ttl
diff --git a/tests/libtracker-data/bnode-coreference/data.ontology b/tests/core/bnode-coreference/data.ontology
index cb2a0d5d3..cb2a0d5d3 100644
--- a/tests/libtracker-data/bnode-coreference/data.ontology
+++ b/tests/core/bnode-coreference/data.ontology
diff --git a/tests/libtracker-data/bnode-coreference/data.ttl b/tests/core/bnode-coreference/data.ttl
index 5f0613f28..5f0613f28 100755
--- a/tests/libtracker-data/bnode-coreference/data.ttl
+++ b/tests/core/bnode-coreference/data.ttl
diff --git a/tests/libtracker-data/bnode-coreference/query.out b/tests/core/bnode-coreference/query.out
index 418f404ea..418f404ea 100755
--- a/tests/libtracker-data/bnode-coreference/query.out
+++ b/tests/core/bnode-coreference/query.out
diff --git a/tests/libtracker-data/bnode-coreference/query.rq b/tests/core/bnode-coreference/query.rq
index f8773771f..f8773771f 100755
--- a/tests/libtracker-data/bnode-coreference/query.rq
+++ b/tests/core/bnode-coreference/query.rq
diff --git a/tests/libtracker-data/bnode/data.ontology b/tests/core/bnode/data.ontology
index cb2a0d5d3..cb2a0d5d3 100644
--- a/tests/libtracker-data/bnode/data.ontology
+++ b/tests/core/bnode/data.ontology
diff --git a/tests/libtracker-data/bnode/data.ttl b/tests/core/bnode/data.ttl
index 5f0613f28..5f0613f28 100644
--- a/tests/libtracker-data/bnode/data.ttl
+++ b/tests/core/bnode/data.ttl
diff --git a/tests/libtracker-data/bnode/query-1.out b/tests/core/bnode/query-1.out
index 3970b1c89..3970b1c89 100644
--- a/tests/libtracker-data/bnode/query-1.out
+++ b/tests/core/bnode/query-1.out
diff --git a/tests/libtracker-data/bnode/query-1.rq b/tests/core/bnode/query-1.rq
index 7f3f3705c..7f3f3705c 100644
--- a/tests/libtracker-data/bnode/query-1.rq
+++ b/tests/core/bnode/query-1.rq
diff --git a/tests/libtracker-data/bnode/query-2.out b/tests/core/bnode/query-2.out
index 3970b1c89..3970b1c89 100644
--- a/tests/libtracker-data/bnode/query-2.out
+++ b/tests/core/bnode/query-2.out
diff --git a/tests/libtracker-data/bnode/query-2.rq b/tests/core/bnode/query-2.rq
index 33b99de9b..33b99de9b 100644
--- a/tests/libtracker-data/bnode/query-2.rq
+++ b/tests/core/bnode/query-2.rq
diff --git a/tests/libtracker-data/bnode/query-3.out b/tests/core/bnode/query-3.out
index a0dc77220..a0dc77220 100644
--- a/tests/libtracker-data/bnode/query-3.out
+++ b/tests/core/bnode/query-3.out
diff --git a/tests/libtracker-data/bnode/query-3.rq b/tests/core/bnode/query-3.rq
index 277a204a2..277a204a2 100644
--- a/tests/libtracker-data/bnode/query-3.rq
+++ b/tests/core/bnode/query-3.rq
diff --git a/tests/libtracker-data/bnode/query-4.out b/tests/core/bnode/query-4.out
index 3970b1c89..3970b1c89 100644
--- a/tests/libtracker-data/bnode/query-4.out
+++ b/tests/core/bnode/query-4.out
diff --git a/tests/libtracker-data/bnode/query-4.rq b/tests/core/bnode/query-4.rq
index 7f3f3705c..7f3f3705c 100644
--- a/tests/libtracker-data/bnode/query-4.rq
+++ b/tests/core/bnode/query-4.rq
diff --git a/tests/libtracker-data/bnode/query-5.out b/tests/core/bnode/query-5.out
index fe1e48f34..fe1e48f34 100644
--- a/tests/libtracker-data/bnode/query-5.out
+++ b/tests/core/bnode/query-5.out
diff --git a/tests/libtracker-data/bnode/query-5.rq b/tests/core/bnode/query-5.rq
index 38fd47855..38fd47855 100644
--- a/tests/libtracker-data/bnode/query-5.rq
+++ b/tests/core/bnode/query-5.rq
diff --git a/tests/libtracker-data/bound/bound1.out b/tests/core/bound/bound1.out
index 134797f27..134797f27 100644
--- a/tests/libtracker-data/bound/bound1.out
+++ b/tests/core/bound/bound1.out
diff --git a/tests/libtracker-data/bound/bound1.rq b/tests/core/bound/bound1.rq
index bb21d4fd3..bb21d4fd3 100755
--- a/tests/libtracker-data/bound/bound1.rq
+++ b/tests/core/bound/bound1.rq
diff --git a/tests/libtracker-data/bound/data.ontology b/tests/core/bound/data.ontology
index bd22eee3e..bd22eee3e 100644
--- a/tests/libtracker-data/bound/data.ontology
+++ b/tests/core/bound/data.ontology
diff --git a/tests/libtracker-data/bound/data.ttl b/tests/core/bound/data.ttl
index 7ee5d37d1..7ee5d37d1 100644
--- a/tests/libtracker-data/bound/data.ttl
+++ b/tests/core/bound/data.ttl
diff --git a/tests/libtracker-data/change/change-test-1.out b/tests/core/change/change-test-1.out
index f27b76c59..f27b76c59 100644
--- a/tests/libtracker-data/change/change-test-1.out
+++ b/tests/core/change/change-test-1.out
diff --git a/tests/libtracker-data/change/change-test-1.rq b/tests/core/change/change-test-1.rq
index 17754c5bd..17754c5bd 100644
--- a/tests/libtracker-data/change/change-test-1.rq
+++ b/tests/core/change/change-test-1.rq
diff --git a/tests/libtracker-data/change/change-test-2.out b/tests/core/change/change-test-2.out
index f0ceea265..f0ceea265 100644
--- a/tests/libtracker-data/change/change-test-2.out
+++ b/tests/core/change/change-test-2.out
diff --git a/tests/libtracker-data/change/change-test-2.rq b/tests/core/change/change-test-2.rq
index 4e8f2fb2d..4e8f2fb2d 100644
--- a/tests/libtracker-data/change/change-test-2.rq
+++ b/tests/core/change/change-test-2.rq
diff --git a/tests/libtracker-data/change/change-test-3.out b/tests/core/change/change-test-3.out
index f0ceea265..f0ceea265 100644
--- a/tests/libtracker-data/change/change-test-3.out
+++ b/tests/core/change/change-test-3.out
diff --git a/tests/libtracker-data/change/change-test-3.rq b/tests/core/change/change-test-3.rq
index 4e8f2fb2d..4e8f2fb2d 100644
--- a/tests/libtracker-data/change/change-test-3.rq
+++ b/tests/core/change/change-test-3.rq
diff --git a/tests/libtracker-data/change/change-test-4.out b/tests/core/change/change-test-4.out
index 2cb6288f4..2cb6288f4 100644
--- a/tests/libtracker-data/change/change-test-4.out
+++ b/tests/core/change/change-test-4.out
diff --git a/tests/libtracker-data/change/change-test-4.rq b/tests/core/change/change-test-4.rq
index a134fadf1..a134fadf1 100644
--- a/tests/libtracker-data/change/change-test-4.rq
+++ b/tests/core/change/change-test-4.rq
diff --git a/tests/libtracker-data/change/change-test-5.out b/tests/core/change/change-test-5.out
index 830687307..830687307 100644
--- a/tests/libtracker-data/change/change-test-5.out
+++ b/tests/core/change/change-test-5.out
diff --git a/tests/libtracker-data/change/change-test-5.rq b/tests/core/change/change-test-5.rq
index a134fadf1..a134fadf1 100644
--- a/tests/libtracker-data/change/change-test-5.rq
+++ b/tests/core/change/change-test-5.rq
diff --git a/tests/libtracker-data/change/change-test-6.out b/tests/core/change/change-test-6.out
index 18dd8162b..18dd8162b 100644
--- a/tests/libtracker-data/change/change-test-6.out
+++ b/tests/core/change/change-test-6.out
diff --git a/tests/libtracker-data/change/change-test-6.rq b/tests/core/change/change-test-6.rq
index 65cc5b729..65cc5b729 100644
--- a/tests/libtracker-data/change/change-test-6.rq
+++ b/tests/core/change/change-test-6.rq
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v1 b/tests/core/change/source/99-example.ontology.v1
index 1f5c4a3d6..1f5c4a3d6 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v1
+++ b/tests/core/change/source/99-example.ontology.v1
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v10 b/tests/core/change/source/99-example.ontology.v10
index 9acc3ea7e..9acc3ea7e 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v10
+++ b/tests/core/change/source/99-example.ontology.v10
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v11 b/tests/core/change/source/99-example.ontology.v11
index a5e6fd61a..a5e6fd61a 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v11
+++ b/tests/core/change/source/99-example.ontology.v11
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v12 b/tests/core/change/source/99-example.ontology.v12
index 1413733f4..1413733f4 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v12
+++ b/tests/core/change/source/99-example.ontology.v12
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v13 b/tests/core/change/source/99-example.ontology.v13
index 88bd6b472..88bd6b472 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v13
+++ b/tests/core/change/source/99-example.ontology.v13
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v2 b/tests/core/change/source/99-example.ontology.v2
index bce31fab8..bce31fab8 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v2
+++ b/tests/core/change/source/99-example.ontology.v2
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v3 b/tests/core/change/source/99-example.ontology.v3
index bed8bd1d4..bed8bd1d4 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v3
+++ b/tests/core/change/source/99-example.ontology.v3
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v4 b/tests/core/change/source/99-example.ontology.v4
index b925740c6..b925740c6 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v4
+++ b/tests/core/change/source/99-example.ontology.v4
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v5 b/tests/core/change/source/99-example.ontology.v5
index 3860fe47f..3860fe47f 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v5
+++ b/tests/core/change/source/99-example.ontology.v5
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v6 b/tests/core/change/source/99-example.ontology.v6
index 7e482f449..7e482f449 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v6
+++ b/tests/core/change/source/99-example.ontology.v6
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v7 b/tests/core/change/source/99-example.ontology.v7
index 7e482f449..7e482f449 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v7
+++ b/tests/core/change/source/99-example.ontology.v7
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v8 b/tests/core/change/source/99-example.ontology.v8
index 322bd028d..322bd028d 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v8
+++ b/tests/core/change/source/99-example.ontology.v8
diff --git a/tests/libtracker-data/change/source/99-example.ontology.v9 b/tests/core/change/source/99-example.ontology.v9
index 9ec1b5894..9ec1b5894 100644
--- a/tests/libtracker-data/change/source/99-example.ontology.v9
+++ b/tests/core/change/source/99-example.ontology.v9
diff --git a/tests/libtracker-data/change/test-1.out b/tests/core/change/test-1.out
index eb2d30494..eb2d30494 100644
--- a/tests/libtracker-data/change/test-1.out
+++ b/tests/core/change/test-1.out
diff --git a/tests/libtracker-data/change/test-1.rq b/tests/core/change/test-1.rq
index 2c3381755..2c3381755 100644
--- a/tests/libtracker-data/change/test-1.rq
+++ b/tests/core/change/test-1.rq
diff --git a/tests/libtracker-data/change/test-2.out b/tests/core/change/test-2.out
index f0af95d1c..f0af95d1c 100644
--- a/tests/libtracker-data/change/test-2.out
+++ b/tests/core/change/test-2.out
diff --git a/tests/libtracker-data/change/test-2.rq b/tests/core/change/test-2.rq
index 85121e22a..85121e22a 100644
--- a/tests/libtracker-data/change/test-2.rq
+++ b/tests/core/change/test-2.rq
diff --git a/tests/libtracker-data/change/test-3.out b/tests/core/change/test-3.out
index dc3682e62..dc3682e62 100644
--- a/tests/libtracker-data/change/test-3.out
+++ b/tests/core/change/test-3.out
diff --git a/tests/libtracker-data/change/test-3.rq b/tests/core/change/test-3.rq
index 25d5f3c33..25d5f3c33 100644
--- a/tests/libtracker-data/change/test-3.rq
+++ b/tests/core/change/test-3.rq
diff --git a/tests/libtracker-data/change/test-4.out b/tests/core/change/test-4.out
index 1026c253e..1026c253e 100644
--- a/tests/libtracker-data/change/test-4.out
+++ b/tests/core/change/test-4.out
diff --git a/tests/libtracker-data/change/test-4.rq b/tests/core/change/test-4.rq
index 075ed235b..075ed235b 100644
--- a/tests/libtracker-data/change/test-4.rq
+++ b/tests/core/change/test-4.rq
diff --git a/tests/libtracker-data/change/test-5.out b/tests/core/change/test-5.out
index 531acfca1..531acfca1 100644
--- a/tests/libtracker-data/change/test-5.out
+++ b/tests/core/change/test-5.out
diff --git a/tests/libtracker-data/change/test-5.rq b/tests/core/change/test-5.rq
index bfe8b837b..bfe8b837b 100644
--- a/tests/libtracker-data/change/test-5.rq
+++ b/tests/core/change/test-5.rq
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v10 b/tests/core/change/updates/99-example.queries.v10
index f53e8eac8..f53e8eac8 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v10
+++ b/tests/core/change/updates/99-example.queries.v10
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v11 b/tests/core/change/updates/99-example.queries.v11
index bab58b3a5..bab58b3a5 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v11
+++ b/tests/core/change/updates/99-example.queries.v11
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v2 b/tests/core/change/updates/99-example.queries.v2
index eca5c3719..eca5c3719 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v2
+++ b/tests/core/change/updates/99-example.queries.v2
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v3 b/tests/core/change/updates/99-example.queries.v3
index 45b4a552e..45b4a552e 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v3
+++ b/tests/core/change/updates/99-example.queries.v3
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v4 b/tests/core/change/updates/99-example.queries.v4
index 6f37824f7..6f37824f7 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v4
+++ b/tests/core/change/updates/99-example.queries.v4
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v5 b/tests/core/change/updates/99-example.queries.v5
index 9e73b5803..9e73b5803 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v5
+++ b/tests/core/change/updates/99-example.queries.v5
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v6 b/tests/core/change/updates/99-example.queries.v6
index b8af357cb..b8af357cb 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v6
+++ b/tests/core/change/updates/99-example.queries.v6
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v7 b/tests/core/change/updates/99-example.queries.v7
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v7
+++ b/tests/core/change/updates/99-example.queries.v7
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v8 b/tests/core/change/updates/99-example.queries.v8
index 5950952a3..5950952a3 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v8
+++ b/tests/core/change/updates/99-example.queries.v8
diff --git a/tests/libtracker-data/change/updates/99-example.queries.v9 b/tests/core/change/updates/99-example.queries.v9
index 6c667836f..6c667836f 100644
--- a/tests/libtracker-data/change/updates/99-example.queries.v9
+++ b/tests/core/change/updates/99-example.queries.v9
diff --git a/tests/libtracker-data/constraint/coexisting-1.out b/tests/core/constraint/coexisting-1.out
index 8be680548..8be680548 100644
--- a/tests/libtracker-data/constraint/coexisting-1.out
+++ b/tests/core/constraint/coexisting-1.out
diff --git a/tests/libtracker-data/constraint/coexisting-1.rq b/tests/core/constraint/coexisting-1.rq
index 3fc6ee60a..3fc6ee60a 100644
--- a/tests/libtracker-data/constraint/coexisting-1.rq
+++ b/tests/core/constraint/coexisting-1.rq
diff --git a/tests/libtracker-data/constraint/coexisting-2.out b/tests/core/constraint/coexisting-2.out
index 22d3c21b7..22d3c21b7 100644
--- a/tests/libtracker-data/constraint/coexisting-2.out
+++ b/tests/core/constraint/coexisting-2.out
diff --git a/tests/libtracker-data/constraint/coexisting-2.rq b/tests/core/constraint/coexisting-2.rq
index 439678b18..439678b18 100644
--- a/tests/libtracker-data/constraint/coexisting-2.rq
+++ b/tests/core/constraint/coexisting-2.rq
diff --git a/tests/libtracker-data/constraint/coexisting-3.out b/tests/core/constraint/coexisting-3.out
index 8be680548..8be680548 100644
--- a/tests/libtracker-data/constraint/coexisting-3.out
+++ b/tests/core/constraint/coexisting-3.out
diff --git a/tests/libtracker-data/constraint/coexisting-3.rq b/tests/core/constraint/coexisting-3.rq
index 1d3f3299c..1d3f3299c 100644
--- a/tests/libtracker-data/constraint/coexisting-3.rq
+++ b/tests/core/constraint/coexisting-3.rq
diff --git a/tests/libtracker-data/constraint/coexisting-4.out b/tests/core/constraint/coexisting-4.out
index 071144f21..071144f21 100644
--- a/tests/libtracker-data/constraint/coexisting-4.out
+++ b/tests/core/constraint/coexisting-4.out
diff --git a/tests/libtracker-data/constraint/coexisting-4.rq b/tests/core/constraint/coexisting-4.rq
index 7dec44fba..7dec44fba 100644
--- a/tests/libtracker-data/constraint/coexisting-4.rq
+++ b/tests/core/constraint/coexisting-4.rq
diff --git a/tests/libtracker-data/constraint/data.rq b/tests/core/constraint/data.rq
index ef6ac9e25..ef6ac9e25 100644
--- a/tests/libtracker-data/constraint/data.rq
+++ b/tests/core/constraint/data.rq
diff --git a/tests/libtracker-data/constraint/empty-graph-1.out b/tests/core/constraint/empty-graph-1.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/constraint/empty-graph-1.out
+++ b/tests/core/constraint/empty-graph-1.out
diff --git a/tests/libtracker-data/constraint/empty-graph-1.rq b/tests/core/constraint/empty-graph-1.rq
index 5587d24ee..5587d24ee 100644
--- a/tests/libtracker-data/constraint/empty-graph-1.rq
+++ b/tests/core/constraint/empty-graph-1.rq
diff --git a/tests/libtracker-data/constraint/empty-graph-2.out b/tests/core/constraint/empty-graph-2.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/constraint/empty-graph-2.out
+++ b/tests/core/constraint/empty-graph-2.out
diff --git a/tests/libtracker-data/constraint/empty-graph-2.rq b/tests/core/constraint/empty-graph-2.rq
index 1d9ad6932..1d9ad6932 100644
--- a/tests/libtracker-data/constraint/empty-graph-2.rq
+++ b/tests/core/constraint/empty-graph-2.rq
diff --git a/tests/libtracker-data/constraint/empty-graph-3.out b/tests/core/constraint/empty-graph-3.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/constraint/empty-graph-3.out
+++ b/tests/core/constraint/empty-graph-3.out
diff --git a/tests/libtracker-data/constraint/empty-graph-3.rq b/tests/core/constraint/empty-graph-3.rq
index 5e981922c..5e981922c 100644
--- a/tests/libtracker-data/constraint/empty-graph-3.rq
+++ b/tests/core/constraint/empty-graph-3.rq
diff --git a/tests/libtracker-data/constraint/empty-graph-4.out b/tests/core/constraint/empty-graph-4.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/constraint/empty-graph-4.out
+++ b/tests/core/constraint/empty-graph-4.out
diff --git a/tests/libtracker-data/constraint/empty-graph-4.rq b/tests/core/constraint/empty-graph-4.rq
index 2994635aa..2994635aa 100644
--- a/tests/libtracker-data/constraint/empty-graph-4.rq
+++ b/tests/core/constraint/empty-graph-4.rq
diff --git a/tests/libtracker-data/constraint/nested-1.out b/tests/core/constraint/nested-1.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/constraint/nested-1.out
+++ b/tests/core/constraint/nested-1.out
diff --git a/tests/libtracker-data/constraint/nested-1.rq b/tests/core/constraint/nested-1.rq
index db172998d..db172998d 100644
--- a/tests/libtracker-data/constraint/nested-1.rq
+++ b/tests/core/constraint/nested-1.rq
diff --git a/tests/libtracker-data/constraint/nested-2.out b/tests/core/constraint/nested-2.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/constraint/nested-2.out
+++ b/tests/core/constraint/nested-2.out
diff --git a/tests/libtracker-data/constraint/nested-2.rq b/tests/core/constraint/nested-2.rq
index dafb152b9..dafb152b9 100644
--- a/tests/libtracker-data/constraint/nested-2.rq
+++ b/tests/core/constraint/nested-2.rq
diff --git a/tests/libtracker-data/constraint/nested-3.out b/tests/core/constraint/nested-3.out
index 19010cc35..19010cc35 100644
--- a/tests/libtracker-data/constraint/nested-3.out
+++ b/tests/core/constraint/nested-3.out
diff --git a/tests/libtracker-data/constraint/nested-3.rq b/tests/core/constraint/nested-3.rq
index a46945d5d..a46945d5d 100644
--- a/tests/libtracker-data/constraint/nested-3.rq
+++ b/tests/core/constraint/nested-3.rq
diff --git a/tests/libtracker-data/constraint/nested-4.out b/tests/core/constraint/nested-4.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/constraint/nested-4.out
+++ b/tests/core/constraint/nested-4.out
diff --git a/tests/libtracker-data/constraint/nested-4.rq b/tests/core/constraint/nested-4.rq
index f43a8a094..f43a8a094 100644
--- a/tests/libtracker-data/constraint/nested-4.rq
+++ b/tests/core/constraint/nested-4.rq
diff --git a/tests/libtracker-data/constraint/nested-5.out b/tests/core/constraint/nested-5.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/constraint/nested-5.out
+++ b/tests/core/constraint/nested-5.out
diff --git a/tests/libtracker-data/constraint/nested-5.rq b/tests/core/constraint/nested-5.rq
index 3b2cd4b50..3b2cd4b50 100644
--- a/tests/libtracker-data/constraint/nested-5.rq
+++ b/tests/core/constraint/nested-5.rq
diff --git a/tests/libtracker-data/constraint/nested-6.out b/tests/core/constraint/nested-6.out
index 5775b9f8c..5775b9f8c 100644
--- a/tests/libtracker-data/constraint/nested-6.out
+++ b/tests/core/constraint/nested-6.out
diff --git a/tests/libtracker-data/constraint/nested-6.rq b/tests/core/constraint/nested-6.rq
index 0f5c67fee..0f5c67fee 100644
--- a/tests/libtracker-data/constraint/nested-6.rq
+++ b/tests/core/constraint/nested-6.rq
diff --git a/tests/libtracker-data/constraint/test.ontology b/tests/core/constraint/test.ontology
index 6f88d2eee..6f88d2eee 100644
--- a/tests/libtracker-data/constraint/test.ontology
+++ b/tests/core/constraint/test.ontology
diff --git a/tests/libtracker-data/construct/construct-pattern.out b/tests/core/construct/construct-pattern.out
index bda80d4c6..bda80d4c6 100644
--- a/tests/libtracker-data/construct/construct-pattern.out
+++ b/tests/core/construct/construct-pattern.out
diff --git a/tests/libtracker-data/construct/construct-pattern.rq b/tests/core/construct/construct-pattern.rq
index d686a48fd..d686a48fd 100644
--- a/tests/libtracker-data/construct/construct-pattern.rq
+++ b/tests/core/construct/construct-pattern.rq
diff --git a/tests/libtracker-data/construct/construct-where.out b/tests/core/construct/construct-where.out
index 6fb4dde44..6fb4dde44 100644
--- a/tests/libtracker-data/construct/construct-where.out
+++ b/tests/core/construct/construct-where.out
diff --git a/tests/libtracker-data/construct/construct-where.rq b/tests/core/construct/construct-where.rq
index cce9b98e7..cce9b98e7 100644
--- a/tests/libtracker-data/construct/construct-where.rq
+++ b/tests/core/construct/construct-where.rq
diff --git a/tests/libtracker-data/construct/construct-with-modifiers.out b/tests/core/construct/construct-with-modifiers.out
index 737959de6..737959de6 100644
--- a/tests/libtracker-data/construct/construct-with-modifiers.out
+++ b/tests/core/construct/construct-with-modifiers.out
diff --git a/tests/libtracker-data/construct/construct-with-modifiers.rq b/tests/core/construct/construct-with-modifiers.rq
index 2f2badefa..2f2badefa 100644
--- a/tests/libtracker-data/construct/construct-with-modifiers.rq
+++ b/tests/core/construct/construct-with-modifiers.rq
diff --git a/tests/libtracker-data/construct/data.ttl b/tests/core/construct/data.ttl
index 7449849fd..7449849fd 100644
--- a/tests/libtracker-data/construct/data.ttl
+++ b/tests/core/construct/data.ttl
diff --git a/tests/libtracker-data/construct/test.ontology b/tests/core/construct/test.ontology
index cc3cd75ca..cc3cd75ca 100644
--- a/tests/libtracker-data/construct/test.ontology
+++ b/tests/core/construct/test.ontology
diff --git a/tests/libtracker-data/datetime/data-1.ttl b/tests/core/datetime/data-1.ttl
index dcd0eb928..dcd0eb928 100644
--- a/tests/libtracker-data/datetime/data-1.ttl
+++ b/tests/core/datetime/data-1.ttl
diff --git a/tests/libtracker-data/datetime/data-2.ttl b/tests/core/datetime/data-2.ttl
index 3903cc27f..3903cc27f 100644
--- a/tests/libtracker-data/datetime/data-2.ttl
+++ b/tests/core/datetime/data-2.ttl
diff --git a/tests/libtracker-data/datetime/data-3.rq b/tests/core/datetime/data-3.rq
index 57dbd802c..57dbd802c 100644
--- a/tests/libtracker-data/datetime/data-3.rq
+++ b/tests/core/datetime/data-3.rq
diff --git a/tests/libtracker-data/datetime/data-4.rq b/tests/core/datetime/data-4.rq
index 0cd6f339b..0cd6f339b 100644
--- a/tests/libtracker-data/datetime/data-4.rq
+++ b/tests/core/datetime/data-4.rq
diff --git a/tests/libtracker-data/datetime/delete-1.out b/tests/core/datetime/delete-1.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/datetime/delete-1.out
+++ b/tests/core/datetime/delete-1.out
diff --git a/tests/libtracker-data/datetime/delete-1.rq b/tests/core/datetime/delete-1.rq
index 6c2e0a01c..6c2e0a01c 100644
--- a/tests/libtracker-data/datetime/delete-1.rq
+++ b/tests/core/datetime/delete-1.rq
diff --git a/tests/libtracker-data/datetime/direct-1.out b/tests/core/datetime/direct-1.out
index a26f10672..a26f10672 100644
--- a/tests/libtracker-data/datetime/direct-1.out
+++ b/tests/core/datetime/direct-1.out
diff --git a/tests/libtracker-data/datetime/direct-1.rq b/tests/core/datetime/direct-1.rq
index a9f90e7a3..a9f90e7a3 100644
--- a/tests/libtracker-data/datetime/direct-1.rq
+++ b/tests/core/datetime/direct-1.rq
diff --git a/tests/libtracker-data/datetime/filter-1.out b/tests/core/datetime/filter-1.out
index 4f6581e08..4f6581e08 100644
--- a/tests/libtracker-data/datetime/filter-1.out
+++ b/tests/core/datetime/filter-1.out
diff --git a/tests/libtracker-data/datetime/filter-1.rq b/tests/core/datetime/filter-1.rq
index e0ab2aeb9..e0ab2aeb9 100644
--- a/tests/libtracker-data/datetime/filter-1.rq
+++ b/tests/core/datetime/filter-1.rq
diff --git a/tests/libtracker-data/datetime/filter-2.out b/tests/core/datetime/filter-2.out
index edb57a0aa..edb57a0aa 100644
--- a/tests/libtracker-data/datetime/filter-2.out
+++ b/tests/core/datetime/filter-2.out
diff --git a/tests/libtracker-data/datetime/filter-2.rq b/tests/core/datetime/filter-2.rq
index bcb5ac340..bcb5ac340 100644
--- a/tests/libtracker-data/datetime/filter-2.rq
+++ b/tests/core/datetime/filter-2.rq
diff --git a/tests/libtracker-data/datetime/filter-3.out b/tests/core/datetime/filter-3.out
index 4907aa6a6..4907aa6a6 100644
--- a/tests/libtracker-data/datetime/filter-3.out
+++ b/tests/core/datetime/filter-3.out
diff --git a/tests/libtracker-data/datetime/filter-3.rq b/tests/core/datetime/filter-3.rq
index 38257e3c2..38257e3c2 100644
--- a/tests/libtracker-data/datetime/filter-3.rq
+++ b/tests/core/datetime/filter-3.rq
diff --git a/tests/libtracker-data/datetime/filter-4.out b/tests/core/datetime/filter-4.out
index edb57a0aa..edb57a0aa 100644
--- a/tests/libtracker-data/datetime/filter-4.out
+++ b/tests/core/datetime/filter-4.out
diff --git a/tests/libtracker-data/datetime/filter-4.rq b/tests/core/datetime/filter-4.rq
index 9e9070c19..9e9070c19 100644
--- a/tests/libtracker-data/datetime/filter-4.rq
+++ b/tests/core/datetime/filter-4.rq
diff --git a/tests/libtracker-data/datetime/filter-5.out b/tests/core/datetime/filter-5.out
index 4907aa6a6..4907aa6a6 100644
--- a/tests/libtracker-data/datetime/filter-5.out
+++ b/tests/core/datetime/filter-5.out
diff --git a/tests/libtracker-data/datetime/filter-5.rq b/tests/core/datetime/filter-5.rq
index 0b2b6dc0b..0b2b6dc0b 100644
--- a/tests/libtracker-data/datetime/filter-5.rq
+++ b/tests/core/datetime/filter-5.rq
diff --git a/tests/libtracker-data/datetime/functions-localtime-1.out b/tests/core/datetime/functions-localtime-1.out
index f808bf8f0..f808bf8f0 100644
--- a/tests/libtracker-data/datetime/functions-localtime-1.out
+++ b/tests/core/datetime/functions-localtime-1.out
diff --git a/tests/libtracker-data/datetime/functions-localtime-1.rq b/tests/core/datetime/functions-localtime-1.rq
index 8b63d5ea7..8b63d5ea7 100644
--- a/tests/libtracker-data/datetime/functions-localtime-1.rq
+++ b/tests/core/datetime/functions-localtime-1.rq
diff --git a/tests/libtracker-data/datetime/functions-timezone-1.out b/tests/core/datetime/functions-timezone-1.out
index 0bf73fee3..0bf73fee3 100644
--- a/tests/libtracker-data/datetime/functions-timezone-1.out
+++ b/tests/core/datetime/functions-timezone-1.out
diff --git a/tests/libtracker-data/datetime/functions-timezone-1.rq b/tests/core/datetime/functions-timezone-1.rq
index 6cd499f7e..6cd499f7e 100644
--- a/tests/libtracker-data/datetime/functions-timezone-1.rq
+++ b/tests/core/datetime/functions-timezone-1.rq
diff --git a/tests/libtracker-data/datetime/functions-timezone-2.out b/tests/core/datetime/functions-timezone-2.out
index 74e034779..74e034779 100644
--- a/tests/libtracker-data/datetime/functions-timezone-2.out
+++ b/tests/core/datetime/functions-timezone-2.out
diff --git a/tests/libtracker-data/datetime/functions-timezone-2.rq b/tests/core/datetime/functions-timezone-2.rq
index d71a80def..d71a80def 100644
--- a/tests/libtracker-data/datetime/functions-timezone-2.rq
+++ b/tests/core/datetime/functions-timezone-2.rq
diff --git a/tests/libtracker-data/datetime/functions-timezone-3.out b/tests/core/datetime/functions-timezone-3.out
index 95239e27b..95239e27b 100644
--- a/tests/libtracker-data/datetime/functions-timezone-3.out
+++ b/tests/core/datetime/functions-timezone-3.out
diff --git a/tests/libtracker-data/datetime/functions-timezone-3.rq b/tests/core/datetime/functions-timezone-3.rq
index 22b005995..22b005995 100644
--- a/tests/libtracker-data/datetime/functions-timezone-3.rq
+++ b/tests/core/datetime/functions-timezone-3.rq
diff --git a/tests/libtracker-data/datetime/functions-tz-1.out b/tests/core/datetime/functions-tz-1.out
index 4f0c9782a..4f0c9782a 100644
--- a/tests/libtracker-data/datetime/functions-tz-1.out
+++ b/tests/core/datetime/functions-tz-1.out
diff --git a/tests/libtracker-data/datetime/functions-tz-1.rq b/tests/core/datetime/functions-tz-1.rq
index a677fd9c2..a677fd9c2 100644
--- a/tests/libtracker-data/datetime/functions-tz-1.rq
+++ b/tests/core/datetime/functions-tz-1.rq
diff --git a/tests/libtracker-data/datetime/insert-1.out b/tests/core/datetime/insert-1.out
index 7dcd21192..7dcd21192 100644
--- a/tests/libtracker-data/datetime/insert-1.out
+++ b/tests/core/datetime/insert-1.out
diff --git a/tests/libtracker-data/datetime/insert-1.rq b/tests/core/datetime/insert-1.rq
index 6c2e0a01c..6c2e0a01c 100644
--- a/tests/libtracker-data/datetime/insert-1.rq
+++ b/tests/core/datetime/insert-1.rq
diff --git a/tests/libtracker-data/datetime/test.ontology b/tests/core/datetime/test.ontology
index ce85fae0d..ce85fae0d 100644
--- a/tests/libtracker-data/datetime/test.ontology
+++ b/tests/core/datetime/test.ontology
diff --git a/tests/libtracker-data/dawg-testcases b/tests/core/dawg-testcases
index 26e834c2d..26e834c2d 100644
--- a/tests/libtracker-data/dawg-testcases
+++ b/tests/core/dawg-testcases
diff --git a/tests/libtracker-data/describe/data.ttl b/tests/core/describe/data.ttl
index 7449849fd..7449849fd 100644
--- a/tests/libtracker-data/describe/data.ttl
+++ b/tests/core/describe/data.ttl
diff --git a/tests/libtracker-data/describe/describe-limit.out b/tests/core/describe/describe-limit.out
index b536c99e2..b536c99e2 100644
--- a/tests/libtracker-data/describe/describe-limit.out
+++ b/tests/core/describe/describe-limit.out
diff --git a/tests/libtracker-data/describe/describe-limit.rq b/tests/core/describe/describe-limit.rq
index 20f4e272b..20f4e272b 100644
--- a/tests/libtracker-data/describe/describe-limit.rq
+++ b/tests/core/describe/describe-limit.rq
diff --git a/tests/libtracker-data/describe/describe-multiple.out b/tests/core/describe/describe-multiple.out
index 8edc0fd45..8edc0fd45 100644
--- a/tests/libtracker-data/describe/describe-multiple.out
+++ b/tests/core/describe/describe-multiple.out
diff --git a/tests/libtracker-data/describe/describe-multiple.rq b/tests/core/describe/describe-multiple.rq
index 3e67f4e16..3e67f4e16 100644
--- a/tests/libtracker-data/describe/describe-multiple.rq
+++ b/tests/core/describe/describe-multiple.rq
diff --git a/tests/libtracker-data/describe/describe-non-existent.out b/tests/core/describe/describe-non-existent.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/describe/describe-non-existent.out
+++ b/tests/core/describe/describe-non-existent.out
diff --git a/tests/libtracker-data/describe/describe-non-existent.rq b/tests/core/describe/describe-non-existent.rq
index e80fd6229..e80fd6229 100644
--- a/tests/libtracker-data/describe/describe-non-existent.rq
+++ b/tests/core/describe/describe-non-existent.rq
diff --git a/tests/libtracker-data/describe/describe-pattern.out b/tests/core/describe/describe-pattern.out
index 84d8d9520..84d8d9520 100644
--- a/tests/libtracker-data/describe/describe-pattern.out
+++ b/tests/core/describe/describe-pattern.out
diff --git a/tests/libtracker-data/describe/describe-pattern.rq b/tests/core/describe/describe-pattern.rq
index 061b49c7a..061b49c7a 100644
--- a/tests/libtracker-data/describe/describe-pattern.rq
+++ b/tests/core/describe/describe-pattern.rq
diff --git a/tests/libtracker-data/describe/describe-single.out b/tests/core/describe/describe-single.out
index b896021ee..b896021ee 100644
--- a/tests/libtracker-data/describe/describe-single.out
+++ b/tests/core/describe/describe-single.out
diff --git a/tests/libtracker-data/describe/describe-single.rq b/tests/core/describe/describe-single.rq
index bc781f9a6..bc781f9a6 100644
--- a/tests/libtracker-data/describe/describe-single.rq
+++ b/tests/core/describe/describe-single.rq
diff --git a/tests/libtracker-data/describe/test.ontology b/tests/core/describe/test.ontology
index cc3cd75ca..cc3cd75ca 100644
--- a/tests/libtracker-data/describe/test.ontology
+++ b/tests/core/describe/test.ontology
diff --git a/tests/libtracker-data/error/bind-reused-same-pattern.out b/tests/core/error/bind-reused-same-pattern.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/error/bind-reused-same-pattern.out
+++ b/tests/core/error/bind-reused-same-pattern.out
diff --git a/tests/libtracker-data/error/bind-reused-same-pattern.rq b/tests/core/error/bind-reused-same-pattern.rq
index 37bf436c7..37bf436c7 100644
--- a/tests/libtracker-data/error/bind-reused-same-pattern.rq
+++ b/tests/core/error/bind-reused-same-pattern.rq
diff --git a/tests/libtracker-data/error/query-error-1.out b/tests/core/error/query-error-1.out
index 715bd15f1..715bd15f1 100644
--- a/tests/libtracker-data/error/query-error-1.out
+++ b/tests/core/error/query-error-1.out
diff --git a/tests/libtracker-data/error/query-error-1.rq b/tests/core/error/query-error-1.rq
index 3ac08ffc5..3ac08ffc5 100644
--- a/tests/libtracker-data/error/query-error-1.rq
+++ b/tests/core/error/query-error-1.rq
diff --git a/tests/libtracker-data/error/query-error-1.ttl b/tests/core/error/query-error-1.ttl
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/error/query-error-1.ttl
+++ b/tests/core/error/query-error-1.ttl
diff --git a/tests/libtracker-data/error/query-error-2.out b/tests/core/error/query-error-2.out
index 4a2b15244..4a2b15244 100644
--- a/tests/libtracker-data/error/query-error-2.out
+++ b/tests/core/error/query-error-2.out
diff --git a/tests/libtracker-data/error/query-error-2.rq b/tests/core/error/query-error-2.rq
index adaa3cdd0..adaa3cdd0 100644
--- a/tests/libtracker-data/error/query-error-2.rq
+++ b/tests/core/error/query-error-2.rq
diff --git a/tests/libtracker-data/error/query-error-2.ttl b/tests/core/error/query-error-2.ttl
index 2240fc41e..2240fc41e 100644
--- a/tests/libtracker-data/error/query-error-2.ttl
+++ b/tests/core/error/query-error-2.ttl
diff --git a/tests/libtracker-data/error/test.ontology b/tests/core/error/test.ontology
index 191fc804e..191fc804e 100644
--- a/tests/libtracker-data/error/test.ontology
+++ b/tests/core/error/test.ontology
diff --git a/tests/libtracker-data/error/update-error-1.rq b/tests/core/error/update-error-1.rq
index 6a4d59dac..6a4d59dac 100644
--- a/tests/libtracker-data/error/update-error-1.rq
+++ b/tests/core/error/update-error-1.rq
diff --git a/tests/libtracker-data/error/update-error-query-1.out b/tests/core/error/update-error-query-1.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/error/update-error-query-1.out
+++ b/tests/core/error/update-error-query-1.out
diff --git a/tests/libtracker-data/error/update-error-query-1.rq b/tests/core/error/update-error-query-1.rq
index 82e520e31..82e520e31 100644
--- a/tests/libtracker-data/error/update-error-query-1.rq
+++ b/tests/core/error/update-error-query-1.rq
diff --git a/tests/libtracker-data/example.index b/tests/core/example.index
index cfa8bf9be..cfa8bf9be 100644
--- a/tests/libtracker-data/example.index
+++ b/tests/core/example.index
diff --git a/tests/libtracker-data/expr-ops/data.ontology b/tests/core/expr-ops/data.ontology
index 3bb2136c2..3bb2136c2 100644
--- a/tests/libtracker-data/expr-ops/data.ontology
+++ b/tests/core/expr-ops/data.ontology
diff --git a/tests/libtracker-data/expr-ops/data.ttl b/tests/core/expr-ops/data.ttl
index b4e082dbe..b4e082dbe 100644
--- a/tests/libtracker-data/expr-ops/data.ttl
+++ b/tests/core/expr-ops/data.ttl
diff --git a/tests/libtracker-data/expr-ops/query-ge-1.out b/tests/core/expr-ops/query-ge-1.out
index eea75470e..eea75470e 100755
--- a/tests/libtracker-data/expr-ops/query-ge-1.out
+++ b/tests/core/expr-ops/query-ge-1.out
diff --git a/tests/libtracker-data/expr-ops/query-ge-1.rq b/tests/core/expr-ops/query-ge-1.rq
index 10f540664..10f540664 100755
--- a/tests/libtracker-data/expr-ops/query-ge-1.rq
+++ b/tests/core/expr-ops/query-ge-1.rq
diff --git a/tests/libtracker-data/expr-ops/query-le-1.out b/tests/core/expr-ops/query-le-1.out
index 7ac38aa30..7ac38aa30 100755
--- a/tests/libtracker-data/expr-ops/query-le-1.out
+++ b/tests/core/expr-ops/query-le-1.out
diff --git a/tests/libtracker-data/expr-ops/query-le-1.rq b/tests/core/expr-ops/query-le-1.rq
index f0b17d1db..f0b17d1db 100755
--- a/tests/libtracker-data/expr-ops/query-le-1.rq
+++ b/tests/core/expr-ops/query-le-1.rq
diff --git a/tests/libtracker-data/expr-ops/query-minus-1.out b/tests/core/expr-ops/query-minus-1.out
index 220102fed..220102fed 100755
--- a/tests/libtracker-data/expr-ops/query-minus-1.out
+++ b/tests/core/expr-ops/query-minus-1.out
diff --git a/tests/libtracker-data/expr-ops/query-minus-1.rq b/tests/core/expr-ops/query-minus-1.rq
index a4c276721..a4c276721 100755
--- a/tests/libtracker-data/expr-ops/query-minus-1.rq
+++ b/tests/core/expr-ops/query-minus-1.rq
diff --git a/tests/libtracker-data/expr-ops/query-mul-1.out b/tests/core/expr-ops/query-mul-1.out
index adf43de23..adf43de23 100755
--- a/tests/libtracker-data/expr-ops/query-mul-1.out
+++ b/tests/core/expr-ops/query-mul-1.out
diff --git a/tests/libtracker-data/expr-ops/query-mul-1.rq b/tests/core/expr-ops/query-mul-1.rq
index 1ff97da5d..1ff97da5d 100755
--- a/tests/libtracker-data/expr-ops/query-mul-1.rq
+++ b/tests/core/expr-ops/query-mul-1.rq
diff --git a/tests/libtracker-data/expr-ops/query-plus-1.out b/tests/core/expr-ops/query-plus-1.out
index 7ac38aa30..7ac38aa30 100755
--- a/tests/libtracker-data/expr-ops/query-plus-1.out
+++ b/tests/core/expr-ops/query-plus-1.out
diff --git a/tests/libtracker-data/expr-ops/query-plus-1.rq b/tests/core/expr-ops/query-plus-1.rq
index 8321ac7e6..8321ac7e6 100755
--- a/tests/libtracker-data/expr-ops/query-plus-1.rq
+++ b/tests/core/expr-ops/query-plus-1.rq
diff --git a/tests/libtracker-data/expr-ops/query-res-1.out b/tests/core/expr-ops/query-res-1.out
index cdf158597..cdf158597 100644
--- a/tests/libtracker-data/expr-ops/query-res-1.out
+++ b/tests/core/expr-ops/query-res-1.out
diff --git a/tests/libtracker-data/expr-ops/query-res-1.rq b/tests/core/expr-ops/query-res-1.rq
index 8456b7e9e..8456b7e9e 100755
--- a/tests/libtracker-data/expr-ops/query-res-1.rq
+++ b/tests/core/expr-ops/query-res-1.rq
diff --git a/tests/libtracker-data/expr-ops/query-unminus-1.out b/tests/core/expr-ops/query-unminus-1.out
index c3acf84c7..c3acf84c7 100755
--- a/tests/libtracker-data/expr-ops/query-unminus-1.out
+++ b/tests/core/expr-ops/query-unminus-1.out
diff --git a/tests/libtracker-data/expr-ops/query-unminus-1.rq b/tests/core/expr-ops/query-unminus-1.rq
index f77d55615..f77d55615 100755
--- a/tests/libtracker-data/expr-ops/query-unminus-1.rq
+++ b/tests/core/expr-ops/query-unminus-1.rq
diff --git a/tests/libtracker-data/expr-ops/query-unplus-1.out b/tests/core/expr-ops/query-unplus-1.out
index c3b11c95b..c3b11c95b 100755
--- a/tests/libtracker-data/expr-ops/query-unplus-1.out
+++ b/tests/core/expr-ops/query-unplus-1.out
diff --git a/tests/libtracker-data/expr-ops/query-unplus-1.rq b/tests/core/expr-ops/query-unplus-1.rq
index 735e99bb9..735e99bb9 100755
--- a/tests/libtracker-data/expr-ops/query-unplus-1.rq
+++ b/tests/core/expr-ops/query-unplus-1.rq
diff --git a/tests/libtracker-data/functions/data-1.ttl b/tests/core/functions/data-1.ttl
index 27220764f..27220764f 100644
--- a/tests/libtracker-data/functions/data-1.ttl
+++ b/tests/core/functions/data-1.ttl
diff --git a/tests/libtracker-data/functions/data-2.ttl b/tests/core/functions/data-2.ttl
index 0018983b7..0018983b7 100644
--- a/tests/libtracker-data/functions/data-2.ttl
+++ b/tests/core/functions/data-2.ttl
diff --git a/tests/libtracker-data/functions/data-3.ttl b/tests/core/functions/data-3.ttl
index c9d823991..c9d823991 100644
--- a/tests/libtracker-data/functions/data-3.ttl
+++ b/tests/core/functions/data-3.ttl
diff --git a/tests/libtracker-data/functions/data-4.ttl b/tests/core/functions/data-4.ttl
index dfe8d498e..dfe8d498e 100644
--- a/tests/libtracker-data/functions/data-4.ttl
+++ b/tests/core/functions/data-4.ttl
diff --git a/tests/libtracker-data/functions/data-5.ttl b/tests/core/functions/data-5.ttl
index f82135711..f82135711 100644
--- a/tests/libtracker-data/functions/data-5.ttl
+++ b/tests/core/functions/data-5.ttl
diff --git a/tests/libtracker-data/functions/functions-builtin-abs-1.out b/tests/core/functions/functions-builtin-abs-1.out
index d691312ad..d691312ad 100644
--- a/tests/libtracker-data/functions/functions-builtin-abs-1.out
+++ b/tests/core/functions/functions-builtin-abs-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-abs-1.rq b/tests/core/functions/functions-builtin-abs-1.rq
index bebb448c2..bebb448c2 100644
--- a/tests/libtracker-data/functions/functions-builtin-abs-1.rq
+++ b/tests/core/functions/functions-builtin-abs-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-bnode-1.out b/tests/core/functions/functions-builtin-bnode-1.out
index 826861551..826861551 100644
--- a/tests/libtracker-data/functions/functions-builtin-bnode-1.out
+++ b/tests/core/functions/functions-builtin-bnode-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-bnode-1.rq b/tests/core/functions/functions-builtin-bnode-1.rq
index 13cc98366..13cc98366 100644
--- a/tests/libtracker-data/functions/functions-builtin-bnode-1.rq
+++ b/tests/core/functions/functions-builtin-bnode-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-bnode-2.out b/tests/core/functions/functions-builtin-bnode-2.out
index 826861551..826861551 100644
--- a/tests/libtracker-data/functions/functions-builtin-bnode-2.out
+++ b/tests/core/functions/functions-builtin-bnode-2.out
diff --git a/tests/libtracker-data/functions/functions-builtin-bnode-2.rq b/tests/core/functions/functions-builtin-bnode-2.rq
index 81afe0a00..81afe0a00 100644
--- a/tests/libtracker-data/functions/functions-builtin-bnode-2.rq
+++ b/tests/core/functions/functions-builtin-bnode-2.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-ceil-1.out b/tests/core/functions/functions-builtin-ceil-1.out
index d4caba38f..d4caba38f 100644
--- a/tests/libtracker-data/functions/functions-builtin-ceil-1.out
+++ b/tests/core/functions/functions-builtin-ceil-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-ceil-1.rq b/tests/core/functions/functions-builtin-ceil-1.rq
index 857cf68ee..857cf68ee 100644
--- a/tests/libtracker-data/functions/functions-builtin-ceil-1.rq
+++ b/tests/core/functions/functions-builtin-ceil-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-contains-1.out b/tests/core/functions/functions-builtin-contains-1.out
index 6cd3c6c29..6cd3c6c29 100644
--- a/tests/libtracker-data/functions/functions-builtin-contains-1.out
+++ b/tests/core/functions/functions-builtin-contains-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-contains-1.rq b/tests/core/functions/functions-builtin-contains-1.rq
index e88afc65c..e88afc65c 100644
--- a/tests/libtracker-data/functions/functions-builtin-contains-1.rq
+++ b/tests/core/functions/functions-builtin-contains-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-day-1.out b/tests/core/functions/functions-builtin-day-1.out
index 4f3685941..4f3685941 100644
--- a/tests/libtracker-data/functions/functions-builtin-day-1.out
+++ b/tests/core/functions/functions-builtin-day-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-day-1.rq b/tests/core/functions/functions-builtin-day-1.rq
index 57647f94a..57647f94a 100644
--- a/tests/libtracker-data/functions/functions-builtin-day-1.rq
+++ b/tests/core/functions/functions-builtin-day-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-encode-for-uri-1.out b/tests/core/functions/functions-builtin-encode-for-uri-1.out
index a6143bb05..a6143bb05 100644
--- a/tests/libtracker-data/functions/functions-builtin-encode-for-uri-1.out
+++ b/tests/core/functions/functions-builtin-encode-for-uri-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-encode-for-uri-1.rq b/tests/core/functions/functions-builtin-encode-for-uri-1.rq
index ff74b4a57..ff74b4a57 100644
--- a/tests/libtracker-data/functions/functions-builtin-encode-for-uri-1.rq
+++ b/tests/core/functions/functions-builtin-encode-for-uri-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-floor-1.out b/tests/core/functions/functions-builtin-floor-1.out
index 471e90cf9..471e90cf9 100644
--- a/tests/libtracker-data/functions/functions-builtin-floor-1.out
+++ b/tests/core/functions/functions-builtin-floor-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-floor-1.rq b/tests/core/functions/functions-builtin-floor-1.rq
index 2b7b65b1e..2b7b65b1e 100644
--- a/tests/libtracker-data/functions/functions-builtin-floor-1.rq
+++ b/tests/core/functions/functions-builtin-floor-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-hash-1.out b/tests/core/functions/functions-builtin-hash-1.out
index 739594c83..739594c83 100644
--- a/tests/libtracker-data/functions/functions-builtin-hash-1.out
+++ b/tests/core/functions/functions-builtin-hash-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-hash-1.rq b/tests/core/functions/functions-builtin-hash-1.rq
index 35b728ba8..35b728ba8 100644
--- a/tests/libtracker-data/functions/functions-builtin-hash-1.rq
+++ b/tests/core/functions/functions-builtin-hash-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-hours-1.out b/tests/core/functions/functions-builtin-hours-1.out
index a05ff54dd..a05ff54dd 100644
--- a/tests/libtracker-data/functions/functions-builtin-hours-1.out
+++ b/tests/core/functions/functions-builtin-hours-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-hours-1.rq b/tests/core/functions/functions-builtin-hours-1.rq
index 5e706d146..5e706d146 100644
--- a/tests/libtracker-data/functions/functions-builtin-hours-1.rq
+++ b/tests/core/functions/functions-builtin-hours-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-if-1.out b/tests/core/functions/functions-builtin-if-1.out
index 17809c402..17809c402 100644
--- a/tests/libtracker-data/functions/functions-builtin-if-1.out
+++ b/tests/core/functions/functions-builtin-if-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-if-1.rq b/tests/core/functions/functions-builtin-if-1.rq
index fc87e24a7..fc87e24a7 100644
--- a/tests/libtracker-data/functions/functions-builtin-if-1.rq
+++ b/tests/core/functions/functions-builtin-if-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-lcase-1.out b/tests/core/functions/functions-builtin-lcase-1.out
index f6d67cdc1..f6d67cdc1 100644
--- a/tests/libtracker-data/functions/functions-builtin-lcase-1.out
+++ b/tests/core/functions/functions-builtin-lcase-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-lcase-1.rq b/tests/core/functions/functions-builtin-lcase-1.rq
index 87cf47b0b..87cf47b0b 100644
--- a/tests/libtracker-data/functions/functions-builtin-lcase-1.rq
+++ b/tests/core/functions/functions-builtin-lcase-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-minutes-1.out b/tests/core/functions/functions-builtin-minutes-1.out
index a7e4a23f4..a7e4a23f4 100644
--- a/tests/libtracker-data/functions/functions-builtin-minutes-1.out
+++ b/tests/core/functions/functions-builtin-minutes-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-minutes-1.rq b/tests/core/functions/functions-builtin-minutes-1.rq
index 32a0c306b..32a0c306b 100644
--- a/tests/libtracker-data/functions/functions-builtin-minutes-1.rq
+++ b/tests/core/functions/functions-builtin-minutes-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-month-1.out b/tests/core/functions/functions-builtin-month-1.out
index a9942add6..a9942add6 100644
--- a/tests/libtracker-data/functions/functions-builtin-month-1.out
+++ b/tests/core/functions/functions-builtin-month-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-month-1.rq b/tests/core/functions/functions-builtin-month-1.rq
index 70b8aef63..70b8aef63 100644
--- a/tests/libtracker-data/functions/functions-builtin-month-1.rq
+++ b/tests/core/functions/functions-builtin-month-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-now-1.out b/tests/core/functions/functions-builtin-now-1.out
index 3bf44eff7..3bf44eff7 100644
--- a/tests/libtracker-data/functions/functions-builtin-now-1.out
+++ b/tests/core/functions/functions-builtin-now-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-now-1.rq b/tests/core/functions/functions-builtin-now-1.rq
index 7a7865210..7a7865210 100644
--- a/tests/libtracker-data/functions/functions-builtin-now-1.rq
+++ b/tests/core/functions/functions-builtin-now-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-rand-1.out b/tests/core/functions/functions-builtin-rand-1.out
index 826861551..826861551 100644
--- a/tests/libtracker-data/functions/functions-builtin-rand-1.out
+++ b/tests/core/functions/functions-builtin-rand-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-rand-1.rq b/tests/core/functions/functions-builtin-rand-1.rq
index f4b92dd86..f4b92dd86 100644
--- a/tests/libtracker-data/functions/functions-builtin-rand-1.rq
+++ b/tests/core/functions/functions-builtin-rand-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-1.out b/tests/core/functions/functions-builtin-replace-1.out
index 6b948ef08..6b948ef08 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-1.out
+++ b/tests/core/functions/functions-builtin-replace-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-1.rq b/tests/core/functions/functions-builtin-replace-1.rq
index b0d4932d7..b0d4932d7 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-1.rq
+++ b/tests/core/functions/functions-builtin-replace-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-2.out b/tests/core/functions/functions-builtin-replace-2.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-2.out
+++ b/tests/core/functions/functions-builtin-replace-2.out
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-2.rq b/tests/core/functions/functions-builtin-replace-2.rq
index 5e1758804..5e1758804 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-2.rq
+++ b/tests/core/functions/functions-builtin-replace-2.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-3.out b/tests/core/functions/functions-builtin-replace-3.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-3.out
+++ b/tests/core/functions/functions-builtin-replace-3.out
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-3.rq b/tests/core/functions/functions-builtin-replace-3.rq
index 1664b44f7..1664b44f7 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-3.rq
+++ b/tests/core/functions/functions-builtin-replace-3.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-4.out b/tests/core/functions/functions-builtin-replace-4.out
index 6b948ef08..6b948ef08 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-4.out
+++ b/tests/core/functions/functions-builtin-replace-4.out
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-4.rq b/tests/core/functions/functions-builtin-replace-4.rq
index 064366947..064366947 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-4.rq
+++ b/tests/core/functions/functions-builtin-replace-4.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-5.out b/tests/core/functions/functions-builtin-replace-5.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-5.out
+++ b/tests/core/functions/functions-builtin-replace-5.out
diff --git a/tests/libtracker-data/functions/functions-builtin-replace-5.rq b/tests/core/functions/functions-builtin-replace-5.rq
index 112eaf47c..112eaf47c 100644
--- a/tests/libtracker-data/functions/functions-builtin-replace-5.rq
+++ b/tests/core/functions/functions-builtin-replace-5.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-round-1.out b/tests/core/functions/functions-builtin-round-1.out
index a8bb9c200..a8bb9c200 100644
--- a/tests/libtracker-data/functions/functions-builtin-round-1.out
+++ b/tests/core/functions/functions-builtin-round-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-round-1.rq b/tests/core/functions/functions-builtin-round-1.rq
index bad8e5fa8..bad8e5fa8 100644
--- a/tests/libtracker-data/functions/functions-builtin-round-1.rq
+++ b/tests/core/functions/functions-builtin-round-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-sameterm-1.out b/tests/core/functions/functions-builtin-sameterm-1.out
index 0e3924af7..0e3924af7 100644
--- a/tests/libtracker-data/functions/functions-builtin-sameterm-1.out
+++ b/tests/core/functions/functions-builtin-sameterm-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-sameterm-1.rq b/tests/core/functions/functions-builtin-sameterm-1.rq
index ba32bef8a..ba32bef8a 100644
--- a/tests/libtracker-data/functions/functions-builtin-sameterm-1.rq
+++ b/tests/core/functions/functions-builtin-sameterm-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-seconds-1.out b/tests/core/functions/functions-builtin-seconds-1.out
index 3f5f63f4d..3f5f63f4d 100644
--- a/tests/libtracker-data/functions/functions-builtin-seconds-1.out
+++ b/tests/core/functions/functions-builtin-seconds-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-seconds-1.rq b/tests/core/functions/functions-builtin-seconds-1.rq
index 53a714ef0..53a714ef0 100644
--- a/tests/libtracker-data/functions/functions-builtin-seconds-1.rq
+++ b/tests/core/functions/functions-builtin-seconds-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-strafter-1.out b/tests/core/functions/functions-builtin-strafter-1.out
index 0bb47714e..0bb47714e 100644
--- a/tests/libtracker-data/functions/functions-builtin-strafter-1.out
+++ b/tests/core/functions/functions-builtin-strafter-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-strafter-1.rq b/tests/core/functions/functions-builtin-strafter-1.rq
index 2ecd458f4..2ecd458f4 100644
--- a/tests/libtracker-data/functions/functions-builtin-strafter-1.rq
+++ b/tests/core/functions/functions-builtin-strafter-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-strbefore-1.out b/tests/core/functions/functions-builtin-strbefore-1.out
index 231f150c5..231f150c5 100644
--- a/tests/libtracker-data/functions/functions-builtin-strbefore-1.out
+++ b/tests/core/functions/functions-builtin-strbefore-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-strbefore-1.rq b/tests/core/functions/functions-builtin-strbefore-1.rq
index 5d565cae2..5d565cae2 100644
--- a/tests/libtracker-data/functions/functions-builtin-strbefore-1.rq
+++ b/tests/core/functions/functions-builtin-strbefore-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-strdt-1.out b/tests/core/functions/functions-builtin-strdt-1.out
index 3dbc1dd05..3dbc1dd05 100644
--- a/tests/libtracker-data/functions/functions-builtin-strdt-1.out
+++ b/tests/core/functions/functions-builtin-strdt-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-strdt-1.rq b/tests/core/functions/functions-builtin-strdt-1.rq
index f57899b49..f57899b49 100644
--- a/tests/libtracker-data/functions/functions-builtin-strdt-1.rq
+++ b/tests/core/functions/functions-builtin-strdt-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-strlen-1.out b/tests/core/functions/functions-builtin-strlen-1.out
index 6ebd24b35..6ebd24b35 100644
--- a/tests/libtracker-data/functions/functions-builtin-strlen-1.out
+++ b/tests/core/functions/functions-builtin-strlen-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-strlen-1.rq b/tests/core/functions/functions-builtin-strlen-1.rq
index 24bd0f69d..24bd0f69d 100644
--- a/tests/libtracker-data/functions/functions-builtin-strlen-1.rq
+++ b/tests/core/functions/functions-builtin-strlen-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-substr-1.out b/tests/core/functions/functions-builtin-substr-1.out
index 61138dedb..61138dedb 100644
--- a/tests/libtracker-data/functions/functions-builtin-substr-1.out
+++ b/tests/core/functions/functions-builtin-substr-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-substr-1.rq b/tests/core/functions/functions-builtin-substr-1.rq
index ebc0dd407..ebc0dd407 100644
--- a/tests/libtracker-data/functions/functions-builtin-substr-1.rq
+++ b/tests/core/functions/functions-builtin-substr-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-ucase-1.out b/tests/core/functions/functions-builtin-ucase-1.out
index 984e73e01..984e73e01 100644
--- a/tests/libtracker-data/functions/functions-builtin-ucase-1.out
+++ b/tests/core/functions/functions-builtin-ucase-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-ucase-1.rq b/tests/core/functions/functions-builtin-ucase-1.rq
index ca9d89971..ca9d89971 100644
--- a/tests/libtracker-data/functions/functions-builtin-ucase-1.rq
+++ b/tests/core/functions/functions-builtin-ucase-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-uri-1.out b/tests/core/functions/functions-builtin-uri-1.out
index cfbe41932..cfbe41932 100644
--- a/tests/libtracker-data/functions/functions-builtin-uri-1.out
+++ b/tests/core/functions/functions-builtin-uri-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-uri-1.rq b/tests/core/functions/functions-builtin-uri-1.rq
index 1e6474fb8..1e6474fb8 100644
--- a/tests/libtracker-data/functions/functions-builtin-uri-1.rq
+++ b/tests/core/functions/functions-builtin-uri-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-uuid-1.out b/tests/core/functions/functions-builtin-uuid-1.out
index 826861551..826861551 100644
--- a/tests/libtracker-data/functions/functions-builtin-uuid-1.out
+++ b/tests/core/functions/functions-builtin-uuid-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-uuid-1.rq b/tests/core/functions/functions-builtin-uuid-1.rq
index 9e6bdac05..9e6bdac05 100644
--- a/tests/libtracker-data/functions/functions-builtin-uuid-1.rq
+++ b/tests/core/functions/functions-builtin-uuid-1.rq
diff --git a/tests/libtracker-data/functions/functions-builtin-year-1.out b/tests/core/functions/functions-builtin-year-1.out
index 44a853e3c..44a853e3c 100644
--- a/tests/libtracker-data/functions/functions-builtin-year-1.out
+++ b/tests/core/functions/functions-builtin-year-1.out
diff --git a/tests/libtracker-data/functions/functions-builtin-year-1.rq b/tests/core/functions/functions-builtin-year-1.rq
index a4092ad88..a4092ad88 100644
--- a/tests/libtracker-data/functions/functions-builtin-year-1.rq
+++ b/tests/core/functions/functions-builtin-year-1.rq
diff --git a/tests/libtracker-data/functions/functions-cast-1.out b/tests/core/functions/functions-cast-1.out
index df71001e4..df71001e4 100644
--- a/tests/libtracker-data/functions/functions-cast-1.out
+++ b/tests/core/functions/functions-cast-1.out
diff --git a/tests/libtracker-data/functions/functions-cast-1.rq b/tests/core/functions/functions-cast-1.rq
index 7c540fdc7..7c540fdc7 100644
--- a/tests/libtracker-data/functions/functions-cast-1.rq
+++ b/tests/core/functions/functions-cast-1.rq
diff --git a/tests/libtracker-data/functions/functions-cast-2.out b/tests/core/functions/functions-cast-2.out
index 3e5e98562..3e5e98562 100644
--- a/tests/libtracker-data/functions/functions-cast-2.out
+++ b/tests/core/functions/functions-cast-2.out
diff --git a/tests/libtracker-data/functions/functions-cast-2.rq b/tests/core/functions/functions-cast-2.rq
index fea7b55d6..fea7b55d6 100644
--- a/tests/libtracker-data/functions/functions-cast-2.rq
+++ b/tests/core/functions/functions-cast-2.rq
diff --git a/tests/libtracker-data/functions/functions-coalesce-1.out b/tests/core/functions/functions-coalesce-1.out
index eb046bba9..eb046bba9 100644
--- a/tests/libtracker-data/functions/functions-coalesce-1.out
+++ b/tests/core/functions/functions-coalesce-1.out
diff --git a/tests/libtracker-data/functions/functions-coalesce-1.rq b/tests/core/functions/functions-coalesce-1.rq
index 9fbec1daa..9fbec1daa 100644
--- a/tests/libtracker-data/functions/functions-coalesce-1.rq
+++ b/tests/core/functions/functions-coalesce-1.rq
diff --git a/tests/libtracker-data/functions/functions-datatypes-1.out b/tests/core/functions/functions-datatypes-1.out
index b10f3540c..b10f3540c 100644
--- a/tests/libtracker-data/functions/functions-datatypes-1.out
+++ b/tests/core/functions/functions-datatypes-1.out
diff --git a/tests/libtracker-data/functions/functions-datatypes-1.rq b/tests/core/functions/functions-datatypes-1.rq
index 5cce80f4f..5cce80f4f 100644
--- a/tests/libtracker-data/functions/functions-datatypes-1.rq
+++ b/tests/core/functions/functions-datatypes-1.rq
diff --git a/tests/libtracker-data/functions/functions-datatypes-2.out b/tests/core/functions/functions-datatypes-2.out
index 8075bd9e2..8075bd9e2 100644
--- a/tests/libtracker-data/functions/functions-datatypes-2.out
+++ b/tests/core/functions/functions-datatypes-2.out
diff --git a/tests/libtracker-data/functions/functions-datatypes-2.rq b/tests/core/functions/functions-datatypes-2.rq
index 5cce80f4f..5cce80f4f 100644
--- a/tests/libtracker-data/functions/functions-datatypes-2.rq
+++ b/tests/core/functions/functions-datatypes-2.rq
diff --git a/tests/libtracker-data/functions/functions-datatypes-3.out b/tests/core/functions/functions-datatypes-3.out
index 11d758678..11d758678 100644
--- a/tests/libtracker-data/functions/functions-datatypes-3.out
+++ b/tests/core/functions/functions-datatypes-3.out
diff --git a/tests/libtracker-data/functions/functions-datatypes-3.rq b/tests/core/functions/functions-datatypes-3.rq
index 5706bab94..5706bab94 100644
--- a/tests/libtracker-data/functions/functions-datatypes-3.rq
+++ b/tests/core/functions/functions-datatypes-3.rq
diff --git a/tests/libtracker-data/functions/functions-datatypes-4.out b/tests/core/functions/functions-datatypes-4.out
index 761d9bb4b..761d9bb4b 100644
--- a/tests/libtracker-data/functions/functions-datatypes-4.out
+++ b/tests/core/functions/functions-datatypes-4.out
diff --git a/tests/libtracker-data/functions/functions-datatypes-4.rq b/tests/core/functions/functions-datatypes-4.rq
index 064bf1e52..064bf1e52 100644
--- a/tests/libtracker-data/functions/functions-datatypes-4.rq
+++ b/tests/core/functions/functions-datatypes-4.rq
diff --git a/tests/libtracker-data/functions/functions-datatypes-5.out b/tests/core/functions/functions-datatypes-5.out
index ff420a114..ff420a114 100644
--- a/tests/libtracker-data/functions/functions-datatypes-5.out
+++ b/tests/core/functions/functions-datatypes-5.out
diff --git a/tests/libtracker-data/functions/functions-datatypes-5.rq b/tests/core/functions/functions-datatypes-5.rq
index 572b435a3..572b435a3 100644
--- a/tests/libtracker-data/functions/functions-datatypes-5.rq
+++ b/tests/core/functions/functions-datatypes-5.rq
diff --git a/tests/libtracker-data/functions/functions-property-1.out b/tests/core/functions/functions-property-1.out
index 575a2807e..575a2807e 100644
--- a/tests/libtracker-data/functions/functions-property-1.out
+++ b/tests/core/functions/functions-property-1.out
diff --git a/tests/libtracker-data/functions/functions-property-1.rq b/tests/core/functions/functions-property-1.rq
index f51da92af..f51da92af 100644
--- a/tests/libtracker-data/functions/functions-property-1.rq
+++ b/tests/core/functions/functions-property-1.rq
diff --git a/tests/libtracker-data/functions/functions-property-2.out b/tests/core/functions/functions-property-2.out
index 0831c62bc..0831c62bc 100644
--- a/tests/libtracker-data/functions/functions-property-2.out
+++ b/tests/core/functions/functions-property-2.out
diff --git a/tests/libtracker-data/functions/functions-property-2.rq b/tests/core/functions/functions-property-2.rq
index ec3193db5..ec3193db5 100644
--- a/tests/libtracker-data/functions/functions-property-2.rq
+++ b/tests/core/functions/functions-property-2.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-1.out b/tests/core/functions/functions-tracker-1.out
index 8fc886dca..8fc886dca 100644
--- a/tests/libtracker-data/functions/functions-tracker-1.out
+++ b/tests/core/functions/functions-tracker-1.out
diff --git a/tests/libtracker-data/functions/functions-tracker-1.rq b/tests/core/functions/functions-tracker-1.rq
index 3bd02f7e7..3bd02f7e7 100644
--- a/tests/libtracker-data/functions/functions-tracker-1.rq
+++ b/tests/core/functions/functions-tracker-1.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-2.out b/tests/core/functions/functions-tracker-2.out
index 80bddb590..80bddb590 100644
--- a/tests/libtracker-data/functions/functions-tracker-2.out
+++ b/tests/core/functions/functions-tracker-2.out
diff --git a/tests/libtracker-data/functions/functions-tracker-2.rq b/tests/core/functions/functions-tracker-2.rq
index 6e7dbb0ea..6e7dbb0ea 100644
--- a/tests/libtracker-data/functions/functions-tracker-2.rq
+++ b/tests/core/functions/functions-tracker-2.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-3.out b/tests/core/functions/functions-tracker-3.out
index 826861551..826861551 100644
--- a/tests/libtracker-data/functions/functions-tracker-3.out
+++ b/tests/core/functions/functions-tracker-3.out
diff --git a/tests/libtracker-data/functions/functions-tracker-3.rq b/tests/core/functions/functions-tracker-3.rq
index 718d4b1be..718d4b1be 100644
--- a/tests/libtracker-data/functions/functions-tracker-3.rq
+++ b/tests/core/functions/functions-tracker-3.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-4.out b/tests/core/functions/functions-tracker-4.out
index b54d1763e..b54d1763e 100644
--- a/tests/libtracker-data/functions/functions-tracker-4.out
+++ b/tests/core/functions/functions-tracker-4.out
diff --git a/tests/libtracker-data/functions/functions-tracker-4.rq b/tests/core/functions/functions-tracker-4.rq
index a4b94357d..a4b94357d 100644
--- a/tests/libtracker-data/functions/functions-tracker-4.rq
+++ b/tests/core/functions/functions-tracker-4.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-5.out b/tests/core/functions/functions-tracker-5.out
index 35320426e..35320426e 100644
--- a/tests/libtracker-data/functions/functions-tracker-5.out
+++ b/tests/core/functions/functions-tracker-5.out
diff --git a/tests/libtracker-data/functions/functions-tracker-5.rq b/tests/core/functions/functions-tracker-5.rq
index 17dd03004..17dd03004 100644
--- a/tests/libtracker-data/functions/functions-tracker-5.rq
+++ b/tests/core/functions/functions-tracker-5.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-6.out b/tests/core/functions/functions-tracker-6.out
index 3c1dfc33e..3c1dfc33e 100644
--- a/tests/libtracker-data/functions/functions-tracker-6.out
+++ b/tests/core/functions/functions-tracker-6.out
diff --git a/tests/libtracker-data/functions/functions-tracker-6.rq b/tests/core/functions/functions-tracker-6.rq
index f7ed7f908..f7ed7f908 100644
--- a/tests/libtracker-data/functions/functions-tracker-6.rq
+++ b/tests/core/functions/functions-tracker-6.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-7.out b/tests/core/functions/functions-tracker-7.out
index e255b526a..e255b526a 100644
--- a/tests/libtracker-data/functions/functions-tracker-7.out
+++ b/tests/core/functions/functions-tracker-7.out
diff --git a/tests/libtracker-data/functions/functions-tracker-7.rq b/tests/core/functions/functions-tracker-7.rq
index cdf10d716..cdf10d716 100644
--- a/tests/libtracker-data/functions/functions-tracker-7.rq
+++ b/tests/core/functions/functions-tracker-7.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-8.out b/tests/core/functions/functions-tracker-8.out
index a16d4a495..a16d4a495 100644
--- a/tests/libtracker-data/functions/functions-tracker-8.out
+++ b/tests/core/functions/functions-tracker-8.out
diff --git a/tests/libtracker-data/functions/functions-tracker-8.rq b/tests/core/functions/functions-tracker-8.rq
index c874b731c..c874b731c 100644
--- a/tests/libtracker-data/functions/functions-tracker-8.rq
+++ b/tests/core/functions/functions-tracker-8.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-9.out b/tests/core/functions/functions-tracker-9.out
index 612672dd7..612672dd7 100644
--- a/tests/libtracker-data/functions/functions-tracker-9.out
+++ b/tests/core/functions/functions-tracker-9.out
diff --git a/tests/libtracker-data/functions/functions-tracker-9.rq b/tests/core/functions/functions-tracker-9.rq
index a011f9a61..a011f9a61 100644
--- a/tests/libtracker-data/functions/functions-tracker-9.rq
+++ b/tests/core/functions/functions-tracker-9.rq
diff --git a/tests/libtracker-data/functions/functions-tracker-loc-1.out b/tests/core/functions/functions-tracker-loc-1.out
index c851d0d62..c851d0d62 100644
--- a/tests/libtracker-data/functions/functions-tracker-loc-1.out
+++ b/tests/core/functions/functions-tracker-loc-1.out
diff --git a/tests/libtracker-data/functions/functions-tracker-loc-1.rq b/tests/core/functions/functions-tracker-loc-1.rq
index ac3b4d340..ac3b4d340 100644
--- a/tests/libtracker-data/functions/functions-tracker-loc-1.rq
+++ b/tests/core/functions/functions-tracker-loc-1.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-1.out b/tests/core/functions/functions-xpath-1.out
index 488aa9ae7..488aa9ae7 100644
--- a/tests/libtracker-data/functions/functions-xpath-1.out
+++ b/tests/core/functions/functions-xpath-1.out
diff --git a/tests/libtracker-data/functions/functions-xpath-1.rq b/tests/core/functions/functions-xpath-1.rq
index 0145b9d0b..0145b9d0b 100644
--- a/tests/libtracker-data/functions/functions-xpath-1.rq
+++ b/tests/core/functions/functions-xpath-1.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-10.out b/tests/core/functions/functions-xpath-10.out
index b51344a0d..b51344a0d 100644
--- a/tests/libtracker-data/functions/functions-xpath-10.out
+++ b/tests/core/functions/functions-xpath-10.out
diff --git a/tests/libtracker-data/functions/functions-xpath-10.rq b/tests/core/functions/functions-xpath-10.rq
index 58b10ee1e..58b10ee1e 100644
--- a/tests/libtracker-data/functions/functions-xpath-10.rq
+++ b/tests/core/functions/functions-xpath-10.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-11.out b/tests/core/functions/functions-xpath-11.out
index ce30269bf..ce30269bf 100644
--- a/tests/libtracker-data/functions/functions-xpath-11.out
+++ b/tests/core/functions/functions-xpath-11.out
diff --git a/tests/libtracker-data/functions/functions-xpath-11.rq b/tests/core/functions/functions-xpath-11.rq
index 516cff452..516cff452 100644
--- a/tests/libtracker-data/functions/functions-xpath-11.rq
+++ b/tests/core/functions/functions-xpath-11.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-12.out b/tests/core/functions/functions-xpath-12.out
index ec197121f..ec197121f 100644
--- a/tests/libtracker-data/functions/functions-xpath-12.out
+++ b/tests/core/functions/functions-xpath-12.out
diff --git a/tests/libtracker-data/functions/functions-xpath-12.rq b/tests/core/functions/functions-xpath-12.rq
index 43de53be5..43de53be5 100644
--- a/tests/libtracker-data/functions/functions-xpath-12.rq
+++ b/tests/core/functions/functions-xpath-12.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-13.out b/tests/core/functions/functions-xpath-13.out
index 4fa476a25..4fa476a25 100644
--- a/tests/libtracker-data/functions/functions-xpath-13.out
+++ b/tests/core/functions/functions-xpath-13.out
diff --git a/tests/libtracker-data/functions/functions-xpath-13.rq b/tests/core/functions/functions-xpath-13.rq
index 1d2f4f669..1d2f4f669 100644
--- a/tests/libtracker-data/functions/functions-xpath-13.rq
+++ b/tests/core/functions/functions-xpath-13.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-14.out b/tests/core/functions/functions-xpath-14.out
index 479855a40..479855a40 100644
--- a/tests/libtracker-data/functions/functions-xpath-14.out
+++ b/tests/core/functions/functions-xpath-14.out
diff --git a/tests/libtracker-data/functions/functions-xpath-14.rq b/tests/core/functions/functions-xpath-14.rq
index b2962736b..b2962736b 100644
--- a/tests/libtracker-data/functions/functions-xpath-14.rq
+++ b/tests/core/functions/functions-xpath-14.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-15.out b/tests/core/functions/functions-xpath-15.out
index 695aebf78..695aebf78 100644
--- a/tests/libtracker-data/functions/functions-xpath-15.out
+++ b/tests/core/functions/functions-xpath-15.out
diff --git a/tests/libtracker-data/functions/functions-xpath-15.rq b/tests/core/functions/functions-xpath-15.rq
index 54a3ba60e..54a3ba60e 100644
--- a/tests/libtracker-data/functions/functions-xpath-15.rq
+++ b/tests/core/functions/functions-xpath-15.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-2.out b/tests/core/functions/functions-xpath-2.out
index 76c3d9390..76c3d9390 100644
--- a/tests/libtracker-data/functions/functions-xpath-2.out
+++ b/tests/core/functions/functions-xpath-2.out
diff --git a/tests/libtracker-data/functions/functions-xpath-2.rq b/tests/core/functions/functions-xpath-2.rq
index ac4840745..ac4840745 100644
--- a/tests/libtracker-data/functions/functions-xpath-2.rq
+++ b/tests/core/functions/functions-xpath-2.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-3.out b/tests/core/functions/functions-xpath-3.out
index 18efc6d5a..18efc6d5a 100644
--- a/tests/libtracker-data/functions/functions-xpath-3.out
+++ b/tests/core/functions/functions-xpath-3.out
diff --git a/tests/libtracker-data/functions/functions-xpath-3.rq b/tests/core/functions/functions-xpath-3.rq
index d123d19da..d123d19da 100644
--- a/tests/libtracker-data/functions/functions-xpath-3.rq
+++ b/tests/core/functions/functions-xpath-3.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-4.out b/tests/core/functions/functions-xpath-4.out
index dc62fd413..dc62fd413 100644
--- a/tests/libtracker-data/functions/functions-xpath-4.out
+++ b/tests/core/functions/functions-xpath-4.out
diff --git a/tests/libtracker-data/functions/functions-xpath-4.rq b/tests/core/functions/functions-xpath-4.rq
index 1f8682213..1f8682213 100644
--- a/tests/libtracker-data/functions/functions-xpath-4.rq
+++ b/tests/core/functions/functions-xpath-4.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-5.out b/tests/core/functions/functions-xpath-5.out
index e96f27bbd..e96f27bbd 100644
--- a/tests/libtracker-data/functions/functions-xpath-5.out
+++ b/tests/core/functions/functions-xpath-5.out
diff --git a/tests/libtracker-data/functions/functions-xpath-5.rq b/tests/core/functions/functions-xpath-5.rq
index 2c8be0d0e..2c8be0d0e 100644
--- a/tests/libtracker-data/functions/functions-xpath-5.rq
+++ b/tests/core/functions/functions-xpath-5.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-6.out b/tests/core/functions/functions-xpath-6.out
index 08cad0207..08cad0207 100644
--- a/tests/libtracker-data/functions/functions-xpath-6.out
+++ b/tests/core/functions/functions-xpath-6.out
diff --git a/tests/libtracker-data/functions/functions-xpath-6.rq b/tests/core/functions/functions-xpath-6.rq
index 6161b4517..6161b4517 100644
--- a/tests/libtracker-data/functions/functions-xpath-6.rq
+++ b/tests/core/functions/functions-xpath-6.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-7.out b/tests/core/functions/functions-xpath-7.out
index 08cad0207..08cad0207 100644
--- a/tests/libtracker-data/functions/functions-xpath-7.out
+++ b/tests/core/functions/functions-xpath-7.out
diff --git a/tests/libtracker-data/functions/functions-xpath-7.rq b/tests/core/functions/functions-xpath-7.rq
index 4b305bb33..4b305bb33 100644
--- a/tests/libtracker-data/functions/functions-xpath-7.rq
+++ b/tests/core/functions/functions-xpath-7.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-8.out b/tests/core/functions/functions-xpath-8.out
index 6695b79a1..6695b79a1 100644
--- a/tests/libtracker-data/functions/functions-xpath-8.out
+++ b/tests/core/functions/functions-xpath-8.out
diff --git a/tests/libtracker-data/functions/functions-xpath-8.rq b/tests/core/functions/functions-xpath-8.rq
index fbcf1531d..fbcf1531d 100644
--- a/tests/libtracker-data/functions/functions-xpath-8.rq
+++ b/tests/core/functions/functions-xpath-8.rq
diff --git a/tests/libtracker-data/functions/functions-xpath-9.out b/tests/core/functions/functions-xpath-9.out
index 9c7259c0a..9c7259c0a 100644
--- a/tests/libtracker-data/functions/functions-xpath-9.out
+++ b/tests/core/functions/functions-xpath-9.out
diff --git a/tests/libtracker-data/functions/functions-xpath-9.rq b/tests/core/functions/functions-xpath-9.rq
index f4f0f5725..f4f0f5725 100644
--- a/tests/libtracker-data/functions/functions-xpath-9.rq
+++ b/tests/core/functions/functions-xpath-9.rq
diff --git a/tests/libtracker-data/functions/test-1.ontology b/tests/core/functions/test-1.ontology
index 743a0e005..743a0e005 100644
--- a/tests/libtracker-data/functions/test-1.ontology
+++ b/tests/core/functions/test-1.ontology
diff --git a/tests/libtracker-data/functions/test-2.ontology b/tests/core/functions/test-2.ontology
index 4dd27505e..4dd27505e 100644
--- a/tests/libtracker-data/functions/test-2.ontology
+++ b/tests/core/functions/test-2.ontology
diff --git a/tests/libtracker-data/graph/add-from-default.out b/tests/core/graph/add-from-default.out
index 16c7607fb..16c7607fb 100644
--- a/tests/libtracker-data/graph/add-from-default.out
+++ b/tests/core/graph/add-from-default.out
diff --git a/tests/libtracker-data/graph/add-from-default.rq b/tests/core/graph/add-from-default.rq
index 1f600846a..1f600846a 100644
--- a/tests/libtracker-data/graph/add-from-default.rq
+++ b/tests/core/graph/add-from-default.rq
diff --git a/tests/libtracker-data/graph/add-from-non-existent.out b/tests/core/graph/add-from-non-existent.out
index 0476f7477..0476f7477 100644
--- a/tests/libtracker-data/graph/add-from-non-existent.out
+++ b/tests/core/graph/add-from-non-existent.out
diff --git a/tests/libtracker-data/graph/add-from-non-existent.rq b/tests/core/graph/add-from-non-existent.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/add-from-non-existent.rq
+++ b/tests/core/graph/add-from-non-existent.rq
diff --git a/tests/libtracker-data/graph/add-into-self.out b/tests/core/graph/add-into-self.out
index 0476f7477..0476f7477 100644
--- a/tests/libtracker-data/graph/add-into-self.out
+++ b/tests/core/graph/add-into-self.out
diff --git a/tests/libtracker-data/graph/add-into-self.rq b/tests/core/graph/add-into-self.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/add-into-self.rq
+++ b/tests/core/graph/add-into-self.rq
diff --git a/tests/libtracker-data/graph/add-to-default.out b/tests/core/graph/add-to-default.out
index 16c7607fb..16c7607fb 100644
--- a/tests/libtracker-data/graph/add-to-default.out
+++ b/tests/core/graph/add-to-default.out
diff --git a/tests/libtracker-data/graph/add-to-default.rq b/tests/core/graph/add-to-default.rq
index fcf167ee2..fcf167ee2 100644
--- a/tests/libtracker-data/graph/add-to-default.rq
+++ b/tests/core/graph/add-to-default.rq
diff --git a/tests/libtracker-data/graph/add-to-existent.out b/tests/core/graph/add-to-existent.out
index f7327c58b..f7327c58b 100644
--- a/tests/libtracker-data/graph/add-to-existent.out
+++ b/tests/core/graph/add-to-existent.out
diff --git a/tests/libtracker-data/graph/add-to-existent.rq b/tests/core/graph/add-to-existent.rq
index cecd2ff71..cecd2ff71 100644
--- a/tests/libtracker-data/graph/add-to-existent.rq
+++ b/tests/core/graph/add-to-existent.rq
diff --git a/tests/libtracker-data/graph/add-to-non-existent.out b/tests/core/graph/add-to-non-existent.out
index d9e765277..d9e765277 100644
--- a/tests/libtracker-data/graph/add-to-non-existent.out
+++ b/tests/core/graph/add-to-non-existent.out
diff --git a/tests/libtracker-data/graph/add-to-non-existent.rq b/tests/core/graph/add-to-non-existent.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/add-to-non-existent.rq
+++ b/tests/core/graph/add-to-non-existent.rq
diff --git a/tests/libtracker-data/graph/add.out b/tests/core/graph/add.out
index 99fcf8545..99fcf8545 100644
--- a/tests/libtracker-data/graph/add.out
+++ b/tests/core/graph/add.out
diff --git a/tests/libtracker-data/graph/add.rq b/tests/core/graph/add.rq
index 451dc9a1a..451dc9a1a 100644
--- a/tests/libtracker-data/graph/add.rq
+++ b/tests/core/graph/add.rq
diff --git a/tests/libtracker-data/graph/clear-all.out b/tests/core/graph/clear-all.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/graph/clear-all.out
+++ b/tests/core/graph/clear-all.out
diff --git a/tests/libtracker-data/graph/clear-all.rq b/tests/core/graph/clear-all.rq
index 4507ec3c0..4507ec3c0 100644
--- a/tests/libtracker-data/graph/clear-all.rq
+++ b/tests/core/graph/clear-all.rq
diff --git a/tests/libtracker-data/graph/clear-default.out b/tests/core/graph/clear-default.out
index 07170b538..07170b538 100644
--- a/tests/libtracker-data/graph/clear-default.out
+++ b/tests/core/graph/clear-default.out
diff --git a/tests/libtracker-data/graph/clear-default.rq b/tests/core/graph/clear-default.rq
index 4507ec3c0..4507ec3c0 100644
--- a/tests/libtracker-data/graph/clear-default.rq
+++ b/tests/core/graph/clear-default.rq
diff --git a/tests/libtracker-data/graph/clear-named.out b/tests/core/graph/clear-named.out
index d24fcef0c..d24fcef0c 100644
--- a/tests/libtracker-data/graph/clear-named.out
+++ b/tests/core/graph/clear-named.out
diff --git a/tests/libtracker-data/graph/clear-named.rq b/tests/core/graph/clear-named.rq
index 4507ec3c0..4507ec3c0 100644
--- a/tests/libtracker-data/graph/clear-named.rq
+++ b/tests/core/graph/clear-named.rq
diff --git a/tests/libtracker-data/graph/clear-non-existent.out b/tests/core/graph/clear-non-existent.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/graph/clear-non-existent.out
+++ b/tests/core/graph/clear-non-existent.out
diff --git a/tests/libtracker-data/graph/clear-non-existent.rq b/tests/core/graph/clear-non-existent.rq
index 51cb7ce31..51cb7ce31 100644
--- a/tests/libtracker-data/graph/clear-non-existent.rq
+++ b/tests/core/graph/clear-non-existent.rq
diff --git a/tests/libtracker-data/graph/clear.out b/tests/core/graph/clear.out
index cf0a28d0b..cf0a28d0b 100644
--- a/tests/libtracker-data/graph/clear.out
+++ b/tests/core/graph/clear.out
diff --git a/tests/libtracker-data/graph/clear.rq b/tests/core/graph/clear.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/clear.rq
+++ b/tests/core/graph/clear.rq
diff --git a/tests/libtracker-data/graph/copy-from-default.out b/tests/core/graph/copy-from-default.out
index d24fcef0c..d24fcef0c 100644
--- a/tests/libtracker-data/graph/copy-from-default.out
+++ b/tests/core/graph/copy-from-default.out
diff --git a/tests/libtracker-data/graph/copy-from-default.rq b/tests/core/graph/copy-from-default.rq
index 22da1a1c8..22da1a1c8 100644
--- a/tests/libtracker-data/graph/copy-from-default.rq
+++ b/tests/core/graph/copy-from-default.rq
diff --git a/tests/libtracker-data/graph/copy-from-non-existent.out b/tests/core/graph/copy-from-non-existent.out
index 0476f7477..0476f7477 100644
--- a/tests/libtracker-data/graph/copy-from-non-existent.out
+++ b/tests/core/graph/copy-from-non-existent.out
diff --git a/tests/libtracker-data/graph/copy-from-non-existent.rq b/tests/core/graph/copy-from-non-existent.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/copy-from-non-existent.rq
+++ b/tests/core/graph/copy-from-non-existent.rq
diff --git a/tests/libtracker-data/graph/copy-into-self.out b/tests/core/graph/copy-into-self.out
index 0476f7477..0476f7477 100644
--- a/tests/libtracker-data/graph/copy-into-self.out
+++ b/tests/core/graph/copy-into-self.out
diff --git a/tests/libtracker-data/graph/copy-into-self.rq b/tests/core/graph/copy-into-self.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/copy-into-self.rq
+++ b/tests/core/graph/copy-into-self.rq
diff --git a/tests/libtracker-data/graph/copy-to-default.out b/tests/core/graph/copy-to-default.out
index e6ab2fcf6..e6ab2fcf6 100644
--- a/tests/libtracker-data/graph/copy-to-default.out
+++ b/tests/core/graph/copy-to-default.out
diff --git a/tests/libtracker-data/graph/copy-to-default.rq b/tests/core/graph/copy-to-default.rq
index fcf167ee2..fcf167ee2 100644
--- a/tests/libtracker-data/graph/copy-to-default.rq
+++ b/tests/core/graph/copy-to-default.rq
diff --git a/tests/libtracker-data/graph/copy-to-existent.out b/tests/core/graph/copy-to-existent.out
index 73dde1d73..73dde1d73 100644
--- a/tests/libtracker-data/graph/copy-to-existent.out
+++ b/tests/core/graph/copy-to-existent.out
diff --git a/tests/libtracker-data/graph/copy-to-existent.rq b/tests/core/graph/copy-to-existent.rq
index cecd2ff71..cecd2ff71 100644
--- a/tests/libtracker-data/graph/copy-to-existent.rq
+++ b/tests/core/graph/copy-to-existent.rq
diff --git a/tests/libtracker-data/graph/copy-to-non-existent.out b/tests/core/graph/copy-to-non-existent.out
index d9e765277..d9e765277 100644
--- a/tests/libtracker-data/graph/copy-to-non-existent.out
+++ b/tests/core/graph/copy-to-non-existent.out
diff --git a/tests/libtracker-data/graph/copy-to-non-existent.rq b/tests/core/graph/copy-to-non-existent.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/copy-to-non-existent.rq
+++ b/tests/core/graph/copy-to-non-existent.rq
diff --git a/tests/libtracker-data/graph/copy.out b/tests/core/graph/copy.out
index d9e765277..d9e765277 100644
--- a/tests/libtracker-data/graph/copy.out
+++ b/tests/core/graph/copy.out
diff --git a/tests/libtracker-data/graph/copy.rq b/tests/core/graph/copy.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/copy.rq
+++ b/tests/core/graph/copy.rq
diff --git a/tests/libtracker-data/graph/data-1.rq b/tests/core/graph/data-1.rq
index 480bc2d43..480bc2d43 100644
--- a/tests/libtracker-data/graph/data-1.rq
+++ b/tests/core/graph/data-1.rq
diff --git a/tests/libtracker-data/graph/data-2.rq b/tests/core/graph/data-2.rq
index 1a8333244..1a8333244 100644
--- a/tests/libtracker-data/graph/data-2.rq
+++ b/tests/core/graph/data-2.rq
diff --git a/tests/libtracker-data/graph/data-3.rq b/tests/core/graph/data-3.rq
index 4b8df074d..4b8df074d 100644
--- a/tests/libtracker-data/graph/data-3.rq
+++ b/tests/core/graph/data-3.rq
diff --git a/tests/libtracker-data/graph/data-4.rq b/tests/core/graph/data-4.rq
index e6e393916..e6e393916 100644
--- a/tests/libtracker-data/graph/data-4.rq
+++ b/tests/core/graph/data-4.rq
diff --git a/tests/libtracker-data/graph/data-5.rq b/tests/core/graph/data-5.rq
index 16395fedc..16395fedc 100644
--- a/tests/libtracker-data/graph/data-5.rq
+++ b/tests/core/graph/data-5.rq
diff --git a/tests/libtracker-data/graph/data-add-from-default.rq b/tests/core/graph/data-add-from-default.rq
index eecd51d4d..eecd51d4d 100644
--- a/tests/libtracker-data/graph/data-add-from-default.rq
+++ b/tests/core/graph/data-add-from-default.rq
diff --git a/tests/libtracker-data/graph/data-add-from-non-existent.rq b/tests/core/graph/data-add-from-non-existent.rq
index f13fb1bf5..f13fb1bf5 100644
--- a/tests/libtracker-data/graph/data-add-from-non-existent.rq
+++ b/tests/core/graph/data-add-from-non-existent.rq
diff --git a/tests/libtracker-data/graph/data-add-into-self.rq b/tests/core/graph/data-add-into-self.rq
index 8876496db..8876496db 100644
--- a/tests/libtracker-data/graph/data-add-into-self.rq
+++ b/tests/core/graph/data-add-into-self.rq
diff --git a/tests/libtracker-data/graph/data-add-to-default.rq b/tests/core/graph/data-add-to-default.rq
index 22cd5b8ed..22cd5b8ed 100644
--- a/tests/libtracker-data/graph/data-add-to-default.rq
+++ b/tests/core/graph/data-add-to-default.rq
diff --git a/tests/libtracker-data/graph/data-add-to-existent.rq b/tests/core/graph/data-add-to-existent.rq
index 7f250e5dd..7f250e5dd 100644
--- a/tests/libtracker-data/graph/data-add-to-existent.rq
+++ b/tests/core/graph/data-add-to-existent.rq
diff --git a/tests/libtracker-data/graph/data-add-to-non-existent.rq b/tests/core/graph/data-add-to-non-existent.rq
index b8cbdd38f..b8cbdd38f 100644
--- a/tests/libtracker-data/graph/data-add-to-non-existent.rq
+++ b/tests/core/graph/data-add-to-non-existent.rq
diff --git a/tests/libtracker-data/graph/data-add.rq b/tests/core/graph/data-add.rq
index f47dc9b01..f47dc9b01 100644
--- a/tests/libtracker-data/graph/data-add.rq
+++ b/tests/core/graph/data-add.rq
diff --git a/tests/libtracker-data/graph/data-clear-all.rq b/tests/core/graph/data-clear-all.rq
index 085cba46a..085cba46a 100644
--- a/tests/libtracker-data/graph/data-clear-all.rq
+++ b/tests/core/graph/data-clear-all.rq
diff --git a/tests/libtracker-data/graph/data-clear-default.rq b/tests/core/graph/data-clear-default.rq
index 5a2eaf066..5a2eaf066 100644
--- a/tests/libtracker-data/graph/data-clear-default.rq
+++ b/tests/core/graph/data-clear-default.rq
diff --git a/tests/libtracker-data/graph/data-clear-named.rq b/tests/core/graph/data-clear-named.rq
index 1d63c5c8e..1d63c5c8e 100644
--- a/tests/libtracker-data/graph/data-clear-named.rq
+++ b/tests/core/graph/data-clear-named.rq
diff --git a/tests/libtracker-data/graph/data-clear-non-existent.rq b/tests/core/graph/data-clear-non-existent.rq
index ea6886671..ea6886671 100644
--- a/tests/libtracker-data/graph/data-clear-non-existent.rq
+++ b/tests/core/graph/data-clear-non-existent.rq
diff --git a/tests/libtracker-data/graph/data-clear.rq b/tests/core/graph/data-clear.rq
index 1805daecb..1805daecb 100644
--- a/tests/libtracker-data/graph/data-clear.rq
+++ b/tests/core/graph/data-clear.rq
diff --git a/tests/libtracker-data/graph/data-copy-from-default.rq b/tests/core/graph/data-copy-from-default.rq
index 6efdacb25..6efdacb25 100644
--- a/tests/libtracker-data/graph/data-copy-from-default.rq
+++ b/tests/core/graph/data-copy-from-default.rq
diff --git a/tests/libtracker-data/graph/data-copy-from-non-existent.rq b/tests/core/graph/data-copy-from-non-existent.rq
index d90fc8733..d90fc8733 100644
--- a/tests/libtracker-data/graph/data-copy-from-non-existent.rq
+++ b/tests/core/graph/data-copy-from-non-existent.rq
diff --git a/tests/libtracker-data/graph/data-copy-into-self.rq b/tests/core/graph/data-copy-into-self.rq
index 489b73f3f..489b73f3f 100644
--- a/tests/libtracker-data/graph/data-copy-into-self.rq
+++ b/tests/core/graph/data-copy-into-self.rq
diff --git a/tests/libtracker-data/graph/data-copy-to-default.rq b/tests/core/graph/data-copy-to-default.rq
index a6c5b06a5..a6c5b06a5 100644
--- a/tests/libtracker-data/graph/data-copy-to-default.rq
+++ b/tests/core/graph/data-copy-to-default.rq
diff --git a/tests/libtracker-data/graph/data-copy-to-existent.rq b/tests/core/graph/data-copy-to-existent.rq
index 76dba86d7..76dba86d7 100644
--- a/tests/libtracker-data/graph/data-copy-to-existent.rq
+++ b/tests/core/graph/data-copy-to-existent.rq
diff --git a/tests/libtracker-data/graph/data-copy-to-non-existent.rq b/tests/core/graph/data-copy-to-non-existent.rq
index 0de5029fa..0de5029fa 100644
--- a/tests/libtracker-data/graph/data-copy-to-non-existent.rq
+++ b/tests/core/graph/data-copy-to-non-existent.rq
diff --git a/tests/libtracker-data/graph/data-copy.rq b/tests/core/graph/data-copy.rq
index b5eb054b6..b5eb054b6 100644
--- a/tests/libtracker-data/graph/data-copy.rq
+++ b/tests/core/graph/data-copy.rq
diff --git a/tests/libtracker-data/graph/data-drop-all.rq b/tests/core/graph/data-drop-all.rq
index 085cba46a..085cba46a 100644
--- a/tests/libtracker-data/graph/data-drop-all.rq
+++ b/tests/core/graph/data-drop-all.rq
diff --git a/tests/libtracker-data/graph/data-drop-default.rq b/tests/core/graph/data-drop-default.rq
index 5a2eaf066..5a2eaf066 100644
--- a/tests/libtracker-data/graph/data-drop-default.rq
+++ b/tests/core/graph/data-drop-default.rq
diff --git a/tests/libtracker-data/graph/data-drop-named.rq b/tests/core/graph/data-drop-named.rq
index 1d63c5c8e..1d63c5c8e 100644
--- a/tests/libtracker-data/graph/data-drop-named.rq
+++ b/tests/core/graph/data-drop-named.rq
diff --git a/tests/libtracker-data/graph/data-drop-non-existent.rq b/tests/core/graph/data-drop-non-existent.rq
index a8132492e..a8132492e 100644
--- a/tests/libtracker-data/graph/data-drop-non-existent.rq
+++ b/tests/core/graph/data-drop-non-existent.rq
diff --git a/tests/libtracker-data/graph/data-drop-silent.rq b/tests/core/graph/data-drop-silent.rq
index 9048a2831..9048a2831 100644
--- a/tests/libtracker-data/graph/data-drop-silent.rq
+++ b/tests/core/graph/data-drop-silent.rq
diff --git a/tests/libtracker-data/graph/data-drop.rq b/tests/core/graph/data-drop.rq
index e79d18291..e79d18291 100644
--- a/tests/libtracker-data/graph/data-drop.rq
+++ b/tests/core/graph/data-drop.rq
diff --git a/tests/libtracker-data/graph/data-move-from-default.rq b/tests/core/graph/data-move-from-default.rq
index 4a9c2783e..4a9c2783e 100644
--- a/tests/libtracker-data/graph/data-move-from-default.rq
+++ b/tests/core/graph/data-move-from-default.rq
diff --git a/tests/libtracker-data/graph/data-move-from-non-existent.rq b/tests/core/graph/data-move-from-non-existent.rq
index e17562ed5..e17562ed5 100644
--- a/tests/libtracker-data/graph/data-move-from-non-existent.rq
+++ b/tests/core/graph/data-move-from-non-existent.rq
diff --git a/tests/libtracker-data/graph/data-move-into-self.rq b/tests/core/graph/data-move-into-self.rq
index 3aca55b25..3aca55b25 100644
--- a/tests/libtracker-data/graph/data-move-into-self.rq
+++ b/tests/core/graph/data-move-into-self.rq
diff --git a/tests/libtracker-data/graph/data-move-to-default.rq b/tests/core/graph/data-move-to-default.rq
index 4fe0fc0e9..4fe0fc0e9 100644
--- a/tests/libtracker-data/graph/data-move-to-default.rq
+++ b/tests/core/graph/data-move-to-default.rq
diff --git a/tests/libtracker-data/graph/data-move-to-existent.rq b/tests/core/graph/data-move-to-existent.rq
index af9ee6a7c..af9ee6a7c 100644
--- a/tests/libtracker-data/graph/data-move-to-existent.rq
+++ b/tests/core/graph/data-move-to-existent.rq
diff --git a/tests/libtracker-data/graph/data-move.rq b/tests/core/graph/data-move.rq
index 7e628ba5e..7e628ba5e 100644
--- a/tests/libtracker-data/graph/data-move.rq
+++ b/tests/core/graph/data-move.rq
diff --git a/tests/libtracker-data/graph/drop-all.out b/tests/core/graph/drop-all.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/graph/drop-all.out
+++ b/tests/core/graph/drop-all.out
diff --git a/tests/libtracker-data/graph/drop-all.rq b/tests/core/graph/drop-all.rq
index 4507ec3c0..4507ec3c0 100644
--- a/tests/libtracker-data/graph/drop-all.rq
+++ b/tests/core/graph/drop-all.rq
diff --git a/tests/libtracker-data/graph/drop-default.out b/tests/core/graph/drop-default.out
index 07170b538..07170b538 100644
--- a/tests/libtracker-data/graph/drop-default.out
+++ b/tests/core/graph/drop-default.out
diff --git a/tests/libtracker-data/graph/drop-default.rq b/tests/core/graph/drop-default.rq
index 4507ec3c0..4507ec3c0 100644
--- a/tests/libtracker-data/graph/drop-default.rq
+++ b/tests/core/graph/drop-default.rq
diff --git a/tests/libtracker-data/graph/drop-named.out b/tests/core/graph/drop-named.out
index d24fcef0c..d24fcef0c 100644
--- a/tests/libtracker-data/graph/drop-named.out
+++ b/tests/core/graph/drop-named.out
diff --git a/tests/libtracker-data/graph/drop-named.rq b/tests/core/graph/drop-named.rq
index 4507ec3c0..4507ec3c0 100644
--- a/tests/libtracker-data/graph/drop-named.rq
+++ b/tests/core/graph/drop-named.rq
diff --git a/tests/libtracker-data/graph/drop-non-existent.out b/tests/core/graph/drop-non-existent.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/graph/drop-non-existent.out
+++ b/tests/core/graph/drop-non-existent.out
diff --git a/tests/libtracker-data/graph/drop-non-existent.rq b/tests/core/graph/drop-non-existent.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/drop-non-existent.rq
+++ b/tests/core/graph/drop-non-existent.rq
diff --git a/tests/libtracker-data/graph/drop-silent.out b/tests/core/graph/drop-silent.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/graph/drop-silent.out
+++ b/tests/core/graph/drop-silent.out
diff --git a/tests/libtracker-data/graph/drop-silent.rq b/tests/core/graph/drop-silent.rq
index 18dfd8ad5..18dfd8ad5 100644
--- a/tests/libtracker-data/graph/drop-silent.rq
+++ b/tests/core/graph/drop-silent.rq
diff --git a/tests/libtracker-data/graph/drop.out b/tests/core/graph/drop.out
index cf0a28d0b..cf0a28d0b 100644
--- a/tests/libtracker-data/graph/drop.out
+++ b/tests/core/graph/drop.out
diff --git a/tests/libtracker-data/graph/drop.rq b/tests/core/graph/drop.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/drop.rq
+++ b/tests/core/graph/drop.rq
diff --git a/tests/libtracker-data/graph/graph-1.out b/tests/core/graph/graph-1.out
index d9e765277..d9e765277 100644
--- a/tests/libtracker-data/graph/graph-1.out
+++ b/tests/core/graph/graph-1.out
diff --git a/tests/libtracker-data/graph/graph-1.rq b/tests/core/graph/graph-1.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/graph-1.rq
+++ b/tests/core/graph/graph-1.rq
diff --git a/tests/libtracker-data/graph/graph-2.out b/tests/core/graph/graph-2.out
index cf0a28d0b..cf0a28d0b 100644
--- a/tests/libtracker-data/graph/graph-2.out
+++ b/tests/core/graph/graph-2.out
diff --git a/tests/libtracker-data/graph/graph-2.rq b/tests/core/graph/graph-2.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/graph-2.rq
+++ b/tests/core/graph/graph-2.rq
diff --git a/tests/libtracker-data/graph/graph-3.out b/tests/core/graph/graph-3.out
index f3c44d894..f3c44d894 100644
--- a/tests/libtracker-data/graph/graph-3.out
+++ b/tests/core/graph/graph-3.out
diff --git a/tests/libtracker-data/graph/graph-3.rq b/tests/core/graph/graph-3.rq
index 07416446f..07416446f 100644
--- a/tests/libtracker-data/graph/graph-3.rq
+++ b/tests/core/graph/graph-3.rq
diff --git a/tests/libtracker-data/graph/graph-4.out b/tests/core/graph/graph-4.out
index 27656c680..27656c680 100644
--- a/tests/libtracker-data/graph/graph-4.out
+++ b/tests/core/graph/graph-4.out
diff --git a/tests/libtracker-data/graph/graph-4.rq b/tests/core/graph/graph-4.rq
index a2f47b49b..a2f47b49b 100644
--- a/tests/libtracker-data/graph/graph-4.rq
+++ b/tests/core/graph/graph-4.rq
diff --git a/tests/libtracker-data/graph/graph-5.out b/tests/core/graph/graph-5.out
index 27656c680..27656c680 100644
--- a/tests/libtracker-data/graph/graph-5.out
+++ b/tests/core/graph/graph-5.out
diff --git a/tests/libtracker-data/graph/graph-5.rq b/tests/core/graph/graph-5.rq
index a2f47b49b..a2f47b49b 100644
--- a/tests/libtracker-data/graph/graph-5.rq
+++ b/tests/core/graph/graph-5.rq
diff --git a/tests/libtracker-data/graph/graph-6.out b/tests/core/graph/graph-6.out
index b87869c39..b87869c39 100644
--- a/tests/libtracker-data/graph/graph-6.out
+++ b/tests/core/graph/graph-6.out
diff --git a/tests/libtracker-data/graph/graph-6.rq b/tests/core/graph/graph-6.rq
index f0905b6e1..f0905b6e1 100644
--- a/tests/libtracker-data/graph/graph-6.rq
+++ b/tests/core/graph/graph-6.rq
diff --git a/tests/libtracker-data/graph/graph-7.out b/tests/core/graph/graph-7.out
index b87869c39..b87869c39 100644
--- a/tests/libtracker-data/graph/graph-7.out
+++ b/tests/core/graph/graph-7.out
diff --git a/tests/libtracker-data/graph/graph-7.rq b/tests/core/graph/graph-7.rq
index a72b4366e..a72b4366e 100644
--- a/tests/libtracker-data/graph/graph-7.rq
+++ b/tests/core/graph/graph-7.rq
diff --git a/tests/libtracker-data/graph/graph-unbound-1.out b/tests/core/graph/graph-unbound-1.out
index dabff8b9f..dabff8b9f 100644
--- a/tests/libtracker-data/graph/graph-unbound-1.out
+++ b/tests/core/graph/graph-unbound-1.out
diff --git a/tests/libtracker-data/graph/graph-unbound-1.rq b/tests/core/graph/graph-unbound-1.rq
index 2ed6176a5..2ed6176a5 100644
--- a/tests/libtracker-data/graph/graph-unbound-1.rq
+++ b/tests/core/graph/graph-unbound-1.rq
diff --git a/tests/libtracker-data/graph/graph-unbound-2.out b/tests/core/graph/graph-unbound-2.out
index b472b5bf2..b472b5bf2 100644
--- a/tests/libtracker-data/graph/graph-unbound-2.out
+++ b/tests/core/graph/graph-unbound-2.out
diff --git a/tests/libtracker-data/graph/graph-unbound-2.rq b/tests/core/graph/graph-unbound-2.rq
index 34a91b5d7..34a91b5d7 100644
--- a/tests/libtracker-data/graph/graph-unbound-2.rq
+++ b/tests/core/graph/graph-unbound-2.rq
diff --git a/tests/libtracker-data/graph/graph-unbound-3.out b/tests/core/graph/graph-unbound-3.out
index 984ce4453..984ce4453 100644
--- a/tests/libtracker-data/graph/graph-unbound-3.out
+++ b/tests/core/graph/graph-unbound-3.out
diff --git a/tests/libtracker-data/graph/graph-unbound-3.rq b/tests/core/graph/graph-unbound-3.rq
index a95980fe9..a95980fe9 100644
--- a/tests/libtracker-data/graph/graph-unbound-3.rq
+++ b/tests/core/graph/graph-unbound-3.rq
diff --git a/tests/libtracker-data/graph/move-from-default.out b/tests/core/graph/move-from-default.out
index d24fcef0c..d24fcef0c 100644
--- a/tests/libtracker-data/graph/move-from-default.out
+++ b/tests/core/graph/move-from-default.out
diff --git a/tests/libtracker-data/graph/move-from-default.rq b/tests/core/graph/move-from-default.rq
index 22da1a1c8..22da1a1c8 100644
--- a/tests/libtracker-data/graph/move-from-default.rq
+++ b/tests/core/graph/move-from-default.rq
diff --git a/tests/libtracker-data/graph/move-from-non-existent.out b/tests/core/graph/move-from-non-existent.out
index 0476f7477..0476f7477 100644
--- a/tests/libtracker-data/graph/move-from-non-existent.out
+++ b/tests/core/graph/move-from-non-existent.out
diff --git a/tests/libtracker-data/graph/move-from-non-existent.rq b/tests/core/graph/move-from-non-existent.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/move-from-non-existent.rq
+++ b/tests/core/graph/move-from-non-existent.rq
diff --git a/tests/libtracker-data/graph/move-into-self.out b/tests/core/graph/move-into-self.out
index 0476f7477..0476f7477 100644
--- a/tests/libtracker-data/graph/move-into-self.out
+++ b/tests/core/graph/move-into-self.out
diff --git a/tests/libtracker-data/graph/move-into-self.rq b/tests/core/graph/move-into-self.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/move-into-self.rq
+++ b/tests/core/graph/move-into-self.rq
diff --git a/tests/libtracker-data/graph/move-to-default.out b/tests/core/graph/move-to-default.out
index e6ab2fcf6..e6ab2fcf6 100644
--- a/tests/libtracker-data/graph/move-to-default.out
+++ b/tests/core/graph/move-to-default.out
diff --git a/tests/libtracker-data/graph/move-to-default.rq b/tests/core/graph/move-to-default.rq
index fcf167ee2..fcf167ee2 100644
--- a/tests/libtracker-data/graph/move-to-default.rq
+++ b/tests/core/graph/move-to-default.rq
diff --git a/tests/libtracker-data/graph/move-to-existent.out b/tests/core/graph/move-to-existent.out
index 194f1e218..194f1e218 100644
--- a/tests/libtracker-data/graph/move-to-existent.out
+++ b/tests/core/graph/move-to-existent.out
diff --git a/tests/libtracker-data/graph/move-to-existent.rq b/tests/core/graph/move-to-existent.rq
index cecd2ff71..cecd2ff71 100644
--- a/tests/libtracker-data/graph/move-to-existent.rq
+++ b/tests/core/graph/move-to-existent.rq
diff --git a/tests/libtracker-data/graph/move.out b/tests/core/graph/move.out
index cf0a28d0b..cf0a28d0b 100644
--- a/tests/libtracker-data/graph/move.out
+++ b/tests/core/graph/move.out
diff --git a/tests/libtracker-data/graph/move.rq b/tests/core/graph/move.rq
index b2464d25a..b2464d25a 100644
--- a/tests/libtracker-data/graph/move.rq
+++ b/tests/core/graph/move.rq
diff --git a/tests/libtracker-data/graph/non-existent-1.out b/tests/core/graph/non-existent-1.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/graph/non-existent-1.out
+++ b/tests/core/graph/non-existent-1.out
diff --git a/tests/libtracker-data/graph/non-existent-1.rq b/tests/core/graph/non-existent-1.rq
index 03d891030..03d891030 100644
--- a/tests/libtracker-data/graph/non-existent-1.rq
+++ b/tests/core/graph/non-existent-1.rq
diff --git a/tests/libtracker-data/graph/non-existent-2.out b/tests/core/graph/non-existent-2.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/graph/non-existent-2.out
+++ b/tests/core/graph/non-existent-2.out
diff --git a/tests/libtracker-data/graph/non-existent-2.rq b/tests/core/graph/non-existent-2.rq
index a61bb46bb..a61bb46bb 100644
--- a/tests/libtracker-data/graph/non-existent-2.rq
+++ b/tests/core/graph/non-existent-2.rq
diff --git a/tests/libtracker-data/graph/non-existent-3.out b/tests/core/graph/non-existent-3.out
index 9bc20d262..9bc20d262 100644
--- a/tests/libtracker-data/graph/non-existent-3.out
+++ b/tests/core/graph/non-existent-3.out
diff --git a/tests/libtracker-data/graph/non-existent-3.rq b/tests/core/graph/non-existent-3.rq
index 73ee53b3a..73ee53b3a 100644
--- a/tests/libtracker-data/graph/non-existent-3.rq
+++ b/tests/core/graph/non-existent-3.rq
diff --git a/tests/libtracker-data/graph/test.ontology b/tests/core/graph/test.ontology
index df1658a1a..df1658a1a 100644
--- a/tests/libtracker-data/graph/test.ontology
+++ b/tests/core/graph/test.ontology
diff --git a/tests/libtracker-data/inline/data.ttl b/tests/core/inline/data.ttl
index d12c5cc9c..d12c5cc9c 100644
--- a/tests/libtracker-data/inline/data.ttl
+++ b/tests/core/inline/data.ttl
diff --git a/tests/libtracker-data/inline/inline-1.out b/tests/core/inline/inline-1.out
index 6001f99c9..6001f99c9 100644
--- a/tests/libtracker-data/inline/inline-1.out
+++ b/tests/core/inline/inline-1.out
diff --git a/tests/libtracker-data/inline/inline-1.rq b/tests/core/inline/inline-1.rq
index d50daa6af..d50daa6af 100644
--- a/tests/libtracker-data/inline/inline-1.rq
+++ b/tests/core/inline/inline-1.rq
diff --git a/tests/libtracker-data/inline/inline-2.out b/tests/core/inline/inline-2.out
index 8eb71a852..8eb71a852 100644
--- a/tests/libtracker-data/inline/inline-2.out
+++ b/tests/core/inline/inline-2.out
diff --git a/tests/libtracker-data/inline/inline-2.rq b/tests/core/inline/inline-2.rq
index 187a00049..187a00049 100644
--- a/tests/libtracker-data/inline/inline-2.rq
+++ b/tests/core/inline/inline-2.rq
diff --git a/tests/libtracker-data/inline/inline-3.out b/tests/core/inline/inline-3.out
index 9ca97713b..9ca97713b 100644
--- a/tests/libtracker-data/inline/inline-3.out
+++ b/tests/core/inline/inline-3.out
diff --git a/tests/libtracker-data/inline/inline-3.rq b/tests/core/inline/inline-3.rq
index e1ea7031b..e1ea7031b 100644
--- a/tests/libtracker-data/inline/inline-3.rq
+++ b/tests/core/inline/inline-3.rq
diff --git a/tests/libtracker-data/inline/inline-4.out b/tests/core/inline/inline-4.out
index 9ca97713b..9ca97713b 100644
--- a/tests/libtracker-data/inline/inline-4.out
+++ b/tests/core/inline/inline-4.out
diff --git a/tests/libtracker-data/inline/inline-4.rq b/tests/core/inline/inline-4.rq
index e7a523bcf..e7a523bcf 100644
--- a/tests/libtracker-data/inline/inline-4.rq
+++ b/tests/core/inline/inline-4.rq
diff --git a/tests/libtracker-data/inline/inline-5.out b/tests/core/inline/inline-5.out
index 65330b1c9..65330b1c9 100644
--- a/tests/libtracker-data/inline/inline-5.out
+++ b/tests/core/inline/inline-5.out
diff --git a/tests/libtracker-data/inline/inline-5.rq b/tests/core/inline/inline-5.rq
index eed09606f..eed09606f 100644
--- a/tests/libtracker-data/inline/inline-5.rq
+++ b/tests/core/inline/inline-5.rq
diff --git a/tests/libtracker-data/inline/inline-6.out b/tests/core/inline/inline-6.out
index 4f8a72a79..4f8a72a79 100644
--- a/tests/libtracker-data/inline/inline-6.out
+++ b/tests/core/inline/inline-6.out
diff --git a/tests/libtracker-data/inline/inline-6.rq b/tests/core/inline/inline-6.rq
index be0c31ce9..be0c31ce9 100644
--- a/tests/libtracker-data/inline/inline-6.rq
+++ b/tests/core/inline/inline-6.rq
diff --git a/tests/libtracker-data/inline/inline-7.out b/tests/core/inline/inline-7.out
index f27b76c59..f27b76c59 100644
--- a/tests/libtracker-data/inline/inline-7.out
+++ b/tests/core/inline/inline-7.out
diff --git a/tests/libtracker-data/inline/inline-7.rq b/tests/core/inline/inline-7.rq
index 5630175d6..5630175d6 100644
--- a/tests/libtracker-data/inline/inline-7.rq
+++ b/tests/core/inline/inline-7.rq
diff --git a/tests/libtracker-data/inline/inline-8.out b/tests/core/inline/inline-8.out
index f27b76c59..f27b76c59 100644
--- a/tests/libtracker-data/inline/inline-8.out
+++ b/tests/core/inline/inline-8.out
diff --git a/tests/libtracker-data/inline/inline-8.rq b/tests/core/inline/inline-8.rq
index 0bad9e9d7..0bad9e9d7 100644
--- a/tests/libtracker-data/inline/inline-8.rq
+++ b/tests/core/inline/inline-8.rq
diff --git a/tests/libtracker-data/inline/inline-9.out b/tests/core/inline/inline-9.out
index 192548e94..192548e94 100644
--- a/tests/libtracker-data/inline/inline-9.out
+++ b/tests/core/inline/inline-9.out
diff --git a/tests/libtracker-data/inline/inline-9.rq b/tests/core/inline/inline-9.rq
index b7417690b..b7417690b 100644
--- a/tests/libtracker-data/inline/inline-9.rq
+++ b/tests/core/inline/inline-9.rq
diff --git a/tests/libtracker-data/inline/test.ontology b/tests/core/inline/test.ontology
index edd6eee78..edd6eee78 100644
--- a/tests/libtracker-data/inline/test.ontology
+++ b/tests/core/inline/test.ontology
diff --git a/tests/libtracker-data/inline/values-1.out b/tests/core/inline/values-1.out
index 9ca97713b..9ca97713b 100644
--- a/tests/libtracker-data/inline/values-1.out
+++ b/tests/core/inline/values-1.out
diff --git a/tests/libtracker-data/inline/values-1.rq b/tests/core/inline/values-1.rq
index d43d31403..d43d31403 100644
--- a/tests/libtracker-data/inline/values-1.rq
+++ b/tests/core/inline/values-1.rq
diff --git a/tests/libtracker-data/inline/values-2.out b/tests/core/inline/values-2.out
index a96f8c188..a96f8c188 100644
--- a/tests/libtracker-data/inline/values-2.out
+++ b/tests/core/inline/values-2.out
diff --git a/tests/libtracker-data/inline/values-2.rq b/tests/core/inline/values-2.rq
index 1130e1fda..1130e1fda 100644
--- a/tests/libtracker-data/inline/values-2.rq
+++ b/tests/core/inline/values-2.rq
diff --git a/tests/libtracker-data/inline/values-3.out b/tests/core/inline/values-3.out
index 9ca97713b..9ca97713b 100644
--- a/tests/libtracker-data/inline/values-3.out
+++ b/tests/core/inline/values-3.out
diff --git a/tests/libtracker-data/inline/values-3.rq b/tests/core/inline/values-3.rq
index 0ab85b543..0ab85b543 100644
--- a/tests/libtracker-data/inline/values-3.rq
+++ b/tests/core/inline/values-3.rq
diff --git a/tests/libtracker-data/inline/values-4.out b/tests/core/inline/values-4.out
index 810c96eee..810c96eee 100644
--- a/tests/libtracker-data/inline/values-4.out
+++ b/tests/core/inline/values-4.out
diff --git a/tests/libtracker-data/inline/values-4.rq b/tests/core/inline/values-4.rq
index 88be6e31a..88be6e31a 100644
--- a/tests/libtracker-data/inline/values-4.rq
+++ b/tests/core/inline/values-4.rq
diff --git a/tests/libtracker-data/langstring/data.rq b/tests/core/langstring/data.rq
index ae71299ea..ae71299ea 100644
--- a/tests/libtracker-data/langstring/data.rq
+++ b/tests/core/langstring/data.rq
diff --git a/tests/libtracker-data/langstring/langmatches.out b/tests/core/langstring/langmatches.out
index 22d3c21b7..22d3c21b7 100644
--- a/tests/libtracker-data/langstring/langmatches.out
+++ b/tests/core/langstring/langmatches.out
diff --git a/tests/libtracker-data/langstring/langmatches.rq b/tests/core/langstring/langmatches.rq
index d8c693b37..d8c693b37 100644
--- a/tests/libtracker-data/langstring/langmatches.rq
+++ b/tests/core/langstring/langmatches.rq
diff --git a/tests/libtracker-data/langstring/match-non-langstring.out b/tests/core/langstring/match-non-langstring.out
index cdf158597..cdf158597 100644
--- a/tests/libtracker-data/langstring/match-non-langstring.out
+++ b/tests/core/langstring/match-non-langstring.out
diff --git a/tests/libtracker-data/langstring/match-non-langstring.rq b/tests/core/langstring/match-non-langstring.rq
index 8d4283d89..8d4283d89 100644
--- a/tests/libtracker-data/langstring/match-non-langstring.rq
+++ b/tests/core/langstring/match-non-langstring.rq
diff --git a/tests/libtracker-data/langstring/match-with-langstring.out b/tests/core/langstring/match-with-langstring.out
index 231f150c5..231f150c5 100644
--- a/tests/libtracker-data/langstring/match-with-langstring.out
+++ b/tests/core/langstring/match-with-langstring.out
diff --git a/tests/libtracker-data/langstring/match-with-langstring.rq b/tests/core/langstring/match-with-langstring.rq
index ff2951875..ff2951875 100644
--- a/tests/libtracker-data/langstring/match-with-langstring.rq
+++ b/tests/core/langstring/match-with-langstring.rq
diff --git a/tests/libtracker-data/langstring/match-with-non-langstring.out b/tests/core/langstring/match-with-non-langstring.out
index cdf158597..cdf158597 100644
--- a/tests/libtracker-data/langstring/match-with-non-langstring.out
+++ b/tests/core/langstring/match-with-non-langstring.out
diff --git a/tests/libtracker-data/langstring/match-with-non-langstring.rq b/tests/core/langstring/match-with-non-langstring.rq
index 3ceef7b28..3ceef7b28 100644
--- a/tests/libtracker-data/langstring/match-with-non-langstring.rq
+++ b/tests/core/langstring/match-with-non-langstring.rq
diff --git a/tests/libtracker-data/langstring/strlang.out b/tests/core/langstring/strlang.out
index 231f150c5..231f150c5 100644
--- a/tests/libtracker-data/langstring/strlang.out
+++ b/tests/core/langstring/strlang.out
diff --git a/tests/libtracker-data/langstring/strlang.rq b/tests/core/langstring/strlang.rq
index 712ae6461..712ae6461 100644
--- a/tests/libtracker-data/langstring/strlang.rq
+++ b/tests/core/langstring/strlang.rq
diff --git a/tests/libtracker-data/langstring/test.ontology b/tests/core/langstring/test.ontology
index 244a33d76..244a33d76 100644
--- a/tests/libtracker-data/langstring/test.ontology
+++ b/tests/core/langstring/test.ontology
diff --git a/tests/libtracker-data/lists/data-list-in-object.rq b/tests/core/lists/data-list-in-object.rq
index c033f459e..c033f459e 100644
--- a/tests/libtracker-data/lists/data-list-in-object.rq
+++ b/tests/core/lists/data-list-in-object.rq
diff --git a/tests/libtracker-data/lists/data-list-in-select.rq b/tests/core/lists/data-list-in-select.rq
index c033f459e..c033f459e 100644
--- a/tests/libtracker-data/lists/data-list-in-select.rq
+++ b/tests/core/lists/data-list-in-select.rq
diff --git a/tests/libtracker-data/lists/data-list-in-subject.rq b/tests/core/lists/data-list-in-subject.rq
index acb407f93..acb407f93 100644
--- a/tests/libtracker-data/lists/data-list-in-subject.rq
+++ b/tests/core/lists/data-list-in-subject.rq
diff --git a/tests/libtracker-data/lists/data-list-nested.rq b/tests/core/lists/data-list-nested.rq
index 3528c527a..3528c527a 100644
--- a/tests/libtracker-data/lists/data-list-nested.rq
+++ b/tests/core/lists/data-list-nested.rq
diff --git a/tests/libtracker-data/lists/list-in-object.out b/tests/core/lists/list-in-object.out
index a5887b21c..a5887b21c 100644
--- a/tests/libtracker-data/lists/list-in-object.out
+++ b/tests/core/lists/list-in-object.out
diff --git a/tests/libtracker-data/lists/list-in-object.rq b/tests/core/lists/list-in-object.rq
index 6c840fcf5..6c840fcf5 100644
--- a/tests/libtracker-data/lists/list-in-object.rq
+++ b/tests/core/lists/list-in-object.rq
diff --git a/tests/libtracker-data/lists/list-in-select.out b/tests/core/lists/list-in-select.out
index f7a095b0a..f7a095b0a 100644
--- a/tests/libtracker-data/lists/list-in-select.out
+++ b/tests/core/lists/list-in-select.out
diff --git a/tests/libtracker-data/lists/list-in-select.rq b/tests/core/lists/list-in-select.rq
index 503952d17..503952d17 100644
--- a/tests/libtracker-data/lists/list-in-select.rq
+++ b/tests/core/lists/list-in-select.rq
diff --git a/tests/libtracker-data/lists/list-in-subject.out b/tests/core/lists/list-in-subject.out
index a5887b21c..a5887b21c 100644
--- a/tests/libtracker-data/lists/list-in-subject.out
+++ b/tests/core/lists/list-in-subject.out
diff --git a/tests/libtracker-data/lists/list-in-subject.rq b/tests/core/lists/list-in-subject.rq
index 1300e7cfc..1300e7cfc 100644
--- a/tests/libtracker-data/lists/list-in-subject.rq
+++ b/tests/core/lists/list-in-subject.rq
diff --git a/tests/libtracker-data/lists/list-nested.out b/tests/core/lists/list-nested.out
index c4503b7e5..c4503b7e5 100644
--- a/tests/libtracker-data/lists/list-nested.out
+++ b/tests/core/lists/list-nested.out
diff --git a/tests/libtracker-data/lists/list-nested.rq b/tests/core/lists/list-nested.rq
index 24d97c6d7..24d97c6d7 100644
--- a/tests/libtracker-data/lists/list-nested.rq
+++ b/tests/core/lists/list-nested.rq
diff --git a/tests/libtracker-data/lists/test.ontology b/tests/core/lists/test.ontology
index 616cdca8a..616cdca8a 100644
--- a/tests/libtracker-data/lists/test.ontology
+++ b/tests/core/lists/test.ontology
diff --git a/tests/libtracker-data/meson.build b/tests/core/meson.build
index 88c869619..c01787995 100644
--- a/tests/libtracker-data/meson.build
+++ b/tests/core/meson.build
@@ -28,7 +28,7 @@ foreach base_name: libtracker_data_tests
     tests += {
       'name': base_name,
       'exe': binary,
-      'suite': ['data'],
+      'suite': ['core'],
     }
 endforeach
 
@@ -43,7 +43,7 @@ foreach base_name: libtracker_data_slow_tests
       tests += {
         'name': base_name,
         'exe': binary,
-        'suite': ['data', 'slow'],
+        'suite': ['core', 'slow'],
         'timeout': 100
     }
 endforeach
diff --git a/tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-1.rq b/tests/core/mixed-cardinality/insert-mixed-cardinality-1.rq
index ae5def017..ae5def017 100644
--- a/tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-1.rq
+++ b/tests/core/mixed-cardinality/insert-mixed-cardinality-1.rq
diff --git a/tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-query-1.out b/tests/core/mixed-cardinality/insert-mixed-cardinality-query-1.out
index eb34b9226..eb34b9226 100644
--- a/tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-query-1.out
+++ b/tests/core/mixed-cardinality/insert-mixed-cardinality-query-1.out
diff --git a/tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-query-1.rq b/tests/core/mixed-cardinality/insert-mixed-cardinality-query-1.rq
index ef3cd1086..ef3cd1086 100644
--- a/tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-query-1.rq
+++ b/tests/core/mixed-cardinality/insert-mixed-cardinality-query-1.rq
diff --git a/tests/libtracker-data/mixed-cardinality/test.ontology b/tests/core/mixed-cardinality/test.ontology
index fe4713139..fe4713139 100644
--- a/tests/libtracker-data/mixed-cardinality/test.ontology
+++ b/tests/core/mixed-cardinality/test.ontology
diff --git a/tests/libtracker-data/mixed-cardinality/update-mixed-cardinality-1.rq b/tests/core/mixed-cardinality/update-mixed-cardinality-1.rq
index c41572276..c41572276 100644
--- a/tests/libtracker-data/mixed-cardinality/update-mixed-cardinality-1.rq
+++ b/tests/core/mixed-cardinality/update-mixed-cardinality-1.rq
diff --git a/tests/libtracker-data/mixed-cardinality/update-mixed-cardinality-query-1.out b/tests/core/mixed-cardinality/update-mixed-cardinality-query-1.out
index f54cc2a6c..f54cc2a6c 100644
--- a/tests/libtracker-data/mixed-cardinality/update-mixed-cardinality-query-1.out
+++ b/tests/core/mixed-cardinality/update-mixed-cardinality-query-1.out
diff --git a/tests/libtracker-data/mixed-cardinality/update-mixed-cardinality-query-1.rq b/tests/core/mixed-cardinality/update-mixed-cardinality-query-1.rq
index ef3cd1086..ef3cd1086 100644
--- a/tests/libtracker-data/mixed-cardinality/update-mixed-cardinality-query-1.rq
+++ b/tests/core/mixed-cardinality/update-mixed-cardinality-query-1.rq
diff --git a/tests/libtracker-data/nie/data-1.ttl b/tests/core/nie/data-1.ttl
index 4834903ef..4834903ef 100644
--- a/tests/libtracker-data/nie/data-1.ttl
+++ b/tests/core/nie/data-1.ttl
diff --git a/tests/libtracker-data/nie/filter-characterset-1.out b/tests/core/nie/filter-characterset-1.out
index 8a557b8d3..8a557b8d3 100644
--- a/tests/libtracker-data/nie/filter-characterset-1.out
+++ b/tests/core/nie/filter-characterset-1.out
diff --git a/tests/libtracker-data/nie/filter-characterset-1.rq b/tests/core/nie/filter-characterset-1.rq
index 3bd16be9b..3bd16be9b 100644
--- a/tests/libtracker-data/nie/filter-characterset-1.rq
+++ b/tests/core/nie/filter-characterset-1.rq
diff --git a/tests/libtracker-data/nie/filter-comment-1.out b/tests/core/nie/filter-comment-1.out
index 56f40df73..56f40df73 100644
--- a/tests/libtracker-data/nie/filter-comment-1.out
+++ b/tests/core/nie/filter-comment-1.out
diff --git a/tests/libtracker-data/nie/filter-comment-1.rq b/tests/core/nie/filter-comment-1.rq
index aa6a1a0d4..aa6a1a0d4 100644
--- a/tests/libtracker-data/nie/filter-comment-1.rq
+++ b/tests/core/nie/filter-comment-1.rq
diff --git a/tests/libtracker-data/nie/filter-description-1.out b/tests/core/nie/filter-description-1.out
index 22114702b..22114702b 100644
--- a/tests/libtracker-data/nie/filter-description-1.out
+++ b/tests/core/nie/filter-description-1.out
diff --git a/tests/libtracker-data/nie/filter-description-1.rq b/tests/core/nie/filter-description-1.rq
index 77deb9a80..77deb9a80 100644
--- a/tests/libtracker-data/nie/filter-description-1.rq
+++ b/tests/core/nie/filter-description-1.rq
diff --git a/tests/libtracker-data/nie/filter-generator-1.out b/tests/core/nie/filter-generator-1.out
index 296574b37..296574b37 100644
--- a/tests/libtracker-data/nie/filter-generator-1.out
+++ b/tests/core/nie/filter-generator-1.out
diff --git a/tests/libtracker-data/nie/filter-generator-1.rq b/tests/core/nie/filter-generator-1.rq
index 6fbcdb7a5..6fbcdb7a5 100644
--- a/tests/libtracker-data/nie/filter-generator-1.rq
+++ b/tests/core/nie/filter-generator-1.rq
diff --git a/tests/libtracker-data/nie/filter-identifier-1.out b/tests/core/nie/filter-identifier-1.out
index cf941f70a..cf941f70a 100644
--- a/tests/libtracker-data/nie/filter-identifier-1.out
+++ b/tests/core/nie/filter-identifier-1.out
diff --git a/tests/libtracker-data/nie/filter-identifier-1.rq b/tests/core/nie/filter-identifier-1.rq
index 1d0a56f37..1d0a56f37 100644
--- a/tests/libtracker-data/nie/filter-identifier-1.rq
+++ b/tests/core/nie/filter-identifier-1.rq
diff --git a/tests/libtracker-data/nie/filter-keyword-1.out b/tests/core/nie/filter-keyword-1.out
index 7f1715a2c..7f1715a2c 100644
--- a/tests/libtracker-data/nie/filter-keyword-1.out
+++ b/tests/core/nie/filter-keyword-1.out
diff --git a/tests/libtracker-data/nie/filter-keyword-1.rq b/tests/core/nie/filter-keyword-1.rq
index 618c36c7a..618c36c7a 100644
--- a/tests/libtracker-data/nie/filter-keyword-1.rq
+++ b/tests/core/nie/filter-keyword-1.rq
diff --git a/tests/libtracker-data/nie/filter-language-1.out b/tests/core/nie/filter-language-1.out
index 0b8fd1c83..0b8fd1c83 100644
--- a/tests/libtracker-data/nie/filter-language-1.out
+++ b/tests/core/nie/filter-language-1.out
diff --git a/tests/libtracker-data/nie/filter-language-1.rq b/tests/core/nie/filter-language-1.rq
index ae857b795..ae857b795 100644
--- a/tests/libtracker-data/nie/filter-language-1.rq
+++ b/tests/core/nie/filter-language-1.rq
diff --git a/tests/libtracker-data/nie/filter-legal-1.out b/tests/core/nie/filter-legal-1.out
index 4651a9bbc..4651a9bbc 100644
--- a/tests/libtracker-data/nie/filter-legal-1.out
+++ b/tests/core/nie/filter-legal-1.out
diff --git a/tests/libtracker-data/nie/filter-legal-1.rq b/tests/core/nie/filter-legal-1.rq
index f1031122d..f1031122d 100644
--- a/tests/libtracker-data/nie/filter-legal-1.rq
+++ b/tests/core/nie/filter-legal-1.rq
diff --git a/tests/libtracker-data/nie/filter-mimetype-1.out b/tests/core/nie/filter-mimetype-1.out
index f9a118e8d..f9a118e8d 100644
--- a/tests/libtracker-data/nie/filter-mimetype-1.out
+++ b/tests/core/nie/filter-mimetype-1.out
diff --git a/tests/libtracker-data/nie/filter-mimetype-1.rq b/tests/core/nie/filter-mimetype-1.rq
index d4405f2d0..d4405f2d0 100644
--- a/tests/libtracker-data/nie/filter-mimetype-1.rq
+++ b/tests/core/nie/filter-mimetype-1.rq
diff --git a/tests/libtracker-data/nie/filter-plaintextcontent-1.out b/tests/core/nie/filter-plaintextcontent-1.out
index 26b3c4780..26b3c4780 100644
--- a/tests/libtracker-data/nie/filter-plaintextcontent-1.out
+++ b/tests/core/nie/filter-plaintextcontent-1.out
diff --git a/tests/libtracker-data/nie/filter-plaintextcontent-1.rq b/tests/core/nie/filter-plaintextcontent-1.rq
index 815703e9a..815703e9a 100644
--- a/tests/libtracker-data/nie/filter-plaintextcontent-1.rq
+++ b/tests/core/nie/filter-plaintextcontent-1.rq
diff --git a/tests/libtracker-data/nie/filter-subject-1.out b/tests/core/nie/filter-subject-1.out
index ea2486298..ea2486298 100644
--- a/tests/libtracker-data/nie/filter-subject-1.out
+++ b/tests/core/nie/filter-subject-1.out
diff --git a/tests/libtracker-data/nie/filter-subject-1.rq b/tests/core/nie/filter-subject-1.rq
index c1ec33ee5..c1ec33ee5 100644
--- a/tests/libtracker-data/nie/filter-subject-1.rq
+++ b/tests/core/nie/filter-subject-1.rq
diff --git a/tests/libtracker-data/nie/filter-title-1.out b/tests/core/nie/filter-title-1.out
index 813754004..813754004 100644
--- a/tests/libtracker-data/nie/filter-title-1.out
+++ b/tests/core/nie/filter-title-1.out
diff --git a/tests/libtracker-data/nie/filter-title-1.rq b/tests/core/nie/filter-title-1.rq
index 294e10b6a..294e10b6a 100644
--- a/tests/libtracker-data/nie/filter-title-1.rq
+++ b/tests/core/nie/filter-title-1.rq
diff --git a/tests/libtracker-data/nie/filter-version-1.out b/tests/core/nie/filter-version-1.out
index 695be71a1..695be71a1 100644
--- a/tests/libtracker-data/nie/filter-version-1.out
+++ b/tests/core/nie/filter-version-1.out
diff --git a/tests/libtracker-data/nie/filter-version-1.rq b/tests/core/nie/filter-version-1.rq
index def2eac0b..def2eac0b 100644
--- a/tests/libtracker-data/nie/filter-version-1.rq
+++ b/tests/core/nie/filter-version-1.rq
diff --git a/tests/libtracker-data/ontology-error/incomplete-property-001.ontology b/tests/core/ontology-error/incomplete-property-001.ontology
index 2918173dc..2918173dc 100644
--- a/tests/libtracker-data/ontology-error/incomplete-property-001.ontology
+++ b/tests/core/ontology-error/incomplete-property-001.ontology
diff --git a/tests/libtracker-data/ontology-error/incomplete-property-001.out b/tests/core/ontology-error/incomplete-property-001.out
index 24be43708..24be43708 100644
--- a/tests/libtracker-data/ontology-error/incomplete-property-001.out
+++ b/tests/core/ontology-error/incomplete-property-001.out
diff --git a/tests/libtracker-data/ontology-error/parsing-errors-001.errors.out b/tests/core/ontology-error/parsing-errors-001.errors.out
index 4069d8a42..4069d8a42 100644
--- a/tests/libtracker-data/ontology-error/parsing-errors-001.errors.out
+++ b/tests/core/ontology-error/parsing-errors-001.errors.out
diff --git a/tests/libtracker-data/ontology-error/parsing-errors-001.ontology b/tests/core/ontology-error/parsing-errors-001.ontology
index b8fa7b9a8..b8fa7b9a8 100644
--- a/tests/libtracker-data/ontology-error/parsing-errors-001.ontology
+++ b/tests/core/ontology-error/parsing-errors-001.ontology
diff --git a/tests/libtracker-data/ontology-error/parsing-errors-001.out b/tests/core/ontology-error/parsing-errors-001.out
index 9501aa35a..9501aa35a 100644
--- a/tests/libtracker-data/ontology-error/parsing-errors-001.out
+++ b/tests/core/ontology-error/parsing-errors-001.out
diff --git a/tests/libtracker-data/ontology-error/unknown-prefix-001.ontology b/tests/core/ontology-error/unknown-prefix-001.ontology
index fdcd415a7..fdcd415a7 100644
--- a/tests/libtracker-data/ontology-error/unknown-prefix-001.ontology
+++ b/tests/core/ontology-error/unknown-prefix-001.ontology
diff --git a/tests/libtracker-data/ontology-error/unknown-prefix-001.out b/tests/core/ontology-error/unknown-prefix-001.out
index a11d1da6b..a11d1da6b 100644
--- a/tests/libtracker-data/ontology-error/unknown-prefix-001.out
+++ b/tests/core/ontology-error/unknown-prefix-001.out
diff --git a/tests/libtracker-data/ontology-error/unknown-prefix-002.ontology b/tests/core/ontology-error/unknown-prefix-002.ontology
index e9c6b8782..e9c6b8782 100644
--- a/tests/libtracker-data/ontology-error/unknown-prefix-002.ontology
+++ b/tests/core/ontology-error/unknown-prefix-002.ontology
diff --git a/tests/libtracker-data/ontology-error/unknown-prefix-002.out b/tests/core/ontology-error/unknown-prefix-002.out
index fd42b2ecc..fd42b2ecc 100644
--- a/tests/libtracker-data/ontology-error/unknown-prefix-002.out
+++ b/tests/core/ontology-error/unknown-prefix-002.out
diff --git a/tests/libtracker-data/ontology-error/unknown-prefix-003.ontology b/tests/core/ontology-error/unknown-prefix-003.ontology
index 012ca1dbf..012ca1dbf 100644
--- a/tests/libtracker-data/ontology-error/unknown-prefix-003.ontology
+++ b/tests/core/ontology-error/unknown-prefix-003.ontology
diff --git a/tests/libtracker-data/ontology-error/unknown-prefix-003.out b/tests/core/ontology-error/unknown-prefix-003.out
index 3283fdcf8..3283fdcf8 100644
--- a/tests/libtracker-data/ontology-error/unknown-prefix-003.out
+++ b/tests/core/ontology-error/unknown-prefix-003.out
diff --git a/tests/libtracker-data/optional/complex-data-1.ttl b/tests/core/optional/complex-data-1.ttl
index 48df4d9bc..48df4d9bc 100644
--- a/tests/libtracker-data/optional/complex-data-1.ttl
+++ b/tests/core/optional/complex-data-1.ttl
diff --git a/tests/libtracker-data/optional/q-opt-complex-1.out b/tests/core/optional/q-opt-complex-1.out
index 9fc8d6da4..9fc8d6da4 100644
--- a/tests/libtracker-data/optional/q-opt-complex-1.out
+++ b/tests/core/optional/q-opt-complex-1.out
diff --git a/tests/libtracker-data/optional/q-opt-complex-1.rq b/tests/core/optional/q-opt-complex-1.rq
index 5d5d3d8af..5d5d3d8af 100644
--- a/tests/libtracker-data/optional/q-opt-complex-1.rq
+++ b/tests/core/optional/q-opt-complex-1.rq
diff --git a/tests/libtracker-data/optional/simple-optional-triple.out b/tests/core/optional/simple-optional-triple.out
index 45542b6a1..45542b6a1 100644
--- a/tests/libtracker-data/optional/simple-optional-triple.out
+++ b/tests/core/optional/simple-optional-triple.out
diff --git a/tests/libtracker-data/optional/simple-optional-triple.rq b/tests/core/optional/simple-optional-triple.rq
index dad2841c2..dad2841c2 100644
--- a/tests/libtracker-data/optional/simple-optional-triple.rq
+++ b/tests/core/optional/simple-optional-triple.rq
diff --git a/tests/libtracker-data/optional/simple-optional-triple.ttl b/tests/core/optional/simple-optional-triple.ttl
index d5345ee71..d5345ee71 100644
--- a/tests/libtracker-data/optional/simple-optional-triple.ttl
+++ b/tests/core/optional/simple-optional-triple.ttl
diff --git a/tests/libtracker-data/optional/test-1.ontology b/tests/core/optional/test-1.ontology
index 770af9ee2..770af9ee2 100644
--- a/tests/libtracker-data/optional/test-1.ontology
+++ b/tests/core/optional/test-1.ontology
diff --git a/tests/libtracker-data/optional/test-2.ontology b/tests/core/optional/test-2.ontology
index 4fbc3e55a..4fbc3e55a 100644
--- a/tests/libtracker-data/optional/test-2.ontology
+++ b/tests/core/optional/test-2.ontology
diff --git a/tests/libtracker-data/property-paths/alternative-path-1.out b/tests/core/property-paths/alternative-path-1.out
index d4ba27789..d4ba27789 100644
--- a/tests/libtracker-data/property-paths/alternative-path-1.out
+++ b/tests/core/property-paths/alternative-path-1.out
diff --git a/tests/libtracker-data/property-paths/alternative-path-1.rq b/tests/core/property-paths/alternative-path-1.rq
index ddd3a0732..ddd3a0732 100644
--- a/tests/libtracker-data/property-paths/alternative-path-1.rq
+++ b/tests/core/property-paths/alternative-path-1.rq
diff --git a/tests/libtracker-data/property-paths/alternative-path-2.out b/tests/core/property-paths/alternative-path-2.out
index ef0350743..ef0350743 100644
--- a/tests/libtracker-data/property-paths/alternative-path-2.out
+++ b/tests/core/property-paths/alternative-path-2.out
diff --git a/tests/libtracker-data/property-paths/alternative-path-2.rq b/tests/core/property-paths/alternative-path-2.rq
index b90ecc092..b90ecc092 100644
--- a/tests/libtracker-data/property-paths/alternative-path-2.rq
+++ b/tests/core/property-paths/alternative-path-2.rq
diff --git a/tests/libtracker-data/property-paths/alternative-path-3.out b/tests/core/property-paths/alternative-path-3.out
index 82644df37..82644df37 100644
--- a/tests/libtracker-data/property-paths/alternative-path-3.out
+++ b/tests/core/property-paths/alternative-path-3.out
diff --git a/tests/libtracker-data/property-paths/alternative-path-3.rq b/tests/core/property-paths/alternative-path-3.rq
index 909619a28..909619a28 100644
--- a/tests/libtracker-data/property-paths/alternative-path-3.rq
+++ b/tests/core/property-paths/alternative-path-3.rq
diff --git a/tests/libtracker-data/property-paths/data-2.ttl b/tests/core/property-paths/data-2.ttl
index 15bafa93a..15bafa93a 100644
--- a/tests/libtracker-data/property-paths/data-2.ttl
+++ b/tests/core/property-paths/data-2.ttl
diff --git a/tests/libtracker-data/property-paths/data-3.rq b/tests/core/property-paths/data-3.rq
index 87da24ec1..87da24ec1 100644
--- a/tests/libtracker-data/property-paths/data-3.rq
+++ b/tests/core/property-paths/data-3.rq
diff --git a/tests/libtracker-data/property-paths/data.ttl b/tests/core/property-paths/data.ttl
index 6eedc6b3d..6eedc6b3d 100644
--- a/tests/libtracker-data/property-paths/data.ttl
+++ b/tests/core/property-paths/data.ttl
diff --git a/tests/libtracker-data/property-paths/inverse-path-1.out b/tests/core/property-paths/inverse-path-1.out
index 9f47bc3b5..9f47bc3b5 100644
--- a/tests/libtracker-data/property-paths/inverse-path-1.out
+++ b/tests/core/property-paths/inverse-path-1.out
diff --git a/tests/libtracker-data/property-paths/inverse-path-1.rq b/tests/core/property-paths/inverse-path-1.rq
index 6b643dfd7..6b643dfd7 100644
--- a/tests/libtracker-data/property-paths/inverse-path-1.rq
+++ b/tests/core/property-paths/inverse-path-1.rq
diff --git a/tests/libtracker-data/property-paths/inverse-path-2.out b/tests/core/property-paths/inverse-path-2.out
index b74164513..b74164513 100644
--- a/tests/libtracker-data/property-paths/inverse-path-2.out
+++ b/tests/core/property-paths/inverse-path-2.out
diff --git a/tests/libtracker-data/property-paths/inverse-path-2.rq b/tests/core/property-paths/inverse-path-2.rq
index e886c8761..e886c8761 100644
--- a/tests/libtracker-data/property-paths/inverse-path-2.rq
+++ b/tests/core/property-paths/inverse-path-2.rq
diff --git a/tests/libtracker-data/property-paths/mixed-graphs.out b/tests/core/property-paths/mixed-graphs.out
index ec7394e44..ec7394e44 100644
--- a/tests/libtracker-data/property-paths/mixed-graphs.out
+++ b/tests/core/property-paths/mixed-graphs.out
diff --git a/tests/libtracker-data/property-paths/mixed-graphs.rq b/tests/core/property-paths/mixed-graphs.rq
index 4c7bb155e..4c7bb155e 100644
--- a/tests/libtracker-data/property-paths/mixed-graphs.rq
+++ b/tests/core/property-paths/mixed-graphs.rq
diff --git a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-1.out b/tests/core/property-paths/mixed-inverse-and-sequence-1.out
index 52c90ceee..52c90ceee 100644
--- a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-1.out
+++ b/tests/core/property-paths/mixed-inverse-and-sequence-1.out
diff --git a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-1.rq b/tests/core/property-paths/mixed-inverse-and-sequence-1.rq
index a77629f6a..a77629f6a 100644
--- a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-1.rq
+++ b/tests/core/property-paths/mixed-inverse-and-sequence-1.rq
diff --git a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-2.out b/tests/core/property-paths/mixed-inverse-and-sequence-2.out
index 0686dec37..0686dec37 100644
--- a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-2.out
+++ b/tests/core/property-paths/mixed-inverse-and-sequence-2.out
diff --git a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-2.rq b/tests/core/property-paths/mixed-inverse-and-sequence-2.rq
index f862af007..f862af007 100644
--- a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-2.rq
+++ b/tests/core/property-paths/mixed-inverse-and-sequence-2.rq
diff --git a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-3.out b/tests/core/property-paths/mixed-inverse-and-sequence-3.out
index d12a7b1c3..d12a7b1c3 100644
--- a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-3.out
+++ b/tests/core/property-paths/mixed-inverse-and-sequence-3.out
diff --git a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-3.rq b/tests/core/property-paths/mixed-inverse-and-sequence-3.rq
index 3383f36b8..3383f36b8 100644
--- a/tests/libtracker-data/property-paths/mixed-inverse-and-sequence-3.rq
+++ b/tests/core/property-paths/mixed-inverse-and-sequence-3.rq
diff --git a/tests/libtracker-data/property-paths/mixed-optional-and-sequence-1.out b/tests/core/property-paths/mixed-optional-and-sequence-1.out
index 772f7c8d3..772f7c8d3 100644
--- a/tests/libtracker-data/property-paths/mixed-optional-and-sequence-1.out
+++ b/tests/core/property-paths/mixed-optional-and-sequence-1.out
diff --git a/tests/libtracker-data/property-paths/mixed-optional-and-sequence-1.rq b/tests/core/property-paths/mixed-optional-and-sequence-1.rq
index 2f348958b..2f348958b 100644
--- a/tests/libtracker-data/property-paths/mixed-optional-and-sequence-1.rq
+++ b/tests/core/property-paths/mixed-optional-and-sequence-1.rq
diff --git a/tests/libtracker-data/property-paths/mixed-optional-and-sequence-2.out b/tests/core/property-paths/mixed-optional-and-sequence-2.out
index ac07aa7ac..ac07aa7ac 100644
--- a/tests/libtracker-data/property-paths/mixed-optional-and-sequence-2.out
+++ b/tests/core/property-paths/mixed-optional-and-sequence-2.out
diff --git a/tests/libtracker-data/property-paths/mixed-optional-and-sequence-2.rq b/tests/core/property-paths/mixed-optional-and-sequence-2.rq
index 0b3cf1142..0b3cf1142 100644
--- a/tests/libtracker-data/property-paths/mixed-optional-and-sequence-2.rq
+++ b/tests/core/property-paths/mixed-optional-and-sequence-2.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-alternative-1.out b/tests/core/property-paths/mixed-recursive-and-alternative-1.out
index 878be5329..878be5329 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-alternative-1.out
+++ b/tests/core/property-paths/mixed-recursive-and-alternative-1.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-alternative-1.rq b/tests/core/property-paths/mixed-recursive-and-alternative-1.rq
index 44d2d7f88..44d2d7f88 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-alternative-1.rq
+++ b/tests/core/property-paths/mixed-recursive-and-alternative-1.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-alternative-2.out b/tests/core/property-paths/mixed-recursive-and-alternative-2.out
index 878be5329..878be5329 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-alternative-2.out
+++ b/tests/core/property-paths/mixed-recursive-and-alternative-2.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-alternative-2.rq b/tests/core/property-paths/mixed-recursive-and-alternative-2.rq
index 7f4c969c5..7f4c969c5 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-alternative-2.rq
+++ b/tests/core/property-paths/mixed-recursive-and-alternative-2.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-1.out b/tests/core/property-paths/mixed-recursive-and-inverse-1.out
index 0c64aed0a..0c64aed0a 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-1.out
+++ b/tests/core/property-paths/mixed-recursive-and-inverse-1.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-1.rq b/tests/core/property-paths/mixed-recursive-and-inverse-1.rq
index a43469234..a43469234 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-1.rq
+++ b/tests/core/property-paths/mixed-recursive-and-inverse-1.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-2.out b/tests/core/property-paths/mixed-recursive-and-inverse-2.out
index 0c64aed0a..0c64aed0a 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-2.out
+++ b/tests/core/property-paths/mixed-recursive-and-inverse-2.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-2.rq b/tests/core/property-paths/mixed-recursive-and-inverse-2.rq
index ebda97c36..ebda97c36 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-2.rq
+++ b/tests/core/property-paths/mixed-recursive-and-inverse-2.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-3.out b/tests/core/property-paths/mixed-recursive-and-inverse-3.out
index 0c64aed0a..0c64aed0a 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-3.out
+++ b/tests/core/property-paths/mixed-recursive-and-inverse-3.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-3.rq b/tests/core/property-paths/mixed-recursive-and-inverse-3.rq
index 3b5416657..3b5416657 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-inverse-3.rq
+++ b/tests/core/property-paths/mixed-recursive-and-inverse-3.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-1.out b/tests/core/property-paths/mixed-recursive-and-sequence-1.out
index ac2dc970e..ac2dc970e 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-1.out
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-1.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-1.rq b/tests/core/property-paths/mixed-recursive-and-sequence-1.rq
index 1771d11d2..1771d11d2 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-1.rq
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-1.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-2.out b/tests/core/property-paths/mixed-recursive-and-sequence-2.out
index 6161c70c4..6161c70c4 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-2.out
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-2.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-2.rq b/tests/core/property-paths/mixed-recursive-and-sequence-2.rq
index befe48c02..befe48c02 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-2.rq
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-2.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-3.out b/tests/core/property-paths/mixed-recursive-and-sequence-3.out
index ac07aa7ac..ac07aa7ac 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-3.out
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-3.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-3.rq b/tests/core/property-paths/mixed-recursive-and-sequence-3.rq
index 82770626b..82770626b 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-3.rq
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-3.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-4.out b/tests/core/property-paths/mixed-recursive-and-sequence-4.out
index 69f7287b8..69f7287b8 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-4.out
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-4.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-4.rq b/tests/core/property-paths/mixed-recursive-and-sequence-4.rq
index e709761e4..e709761e4 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-4.rq
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-4.rq
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-5.out b/tests/core/property-paths/mixed-recursive-and-sequence-5.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-5.out
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-5.out
diff --git a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-5.rq b/tests/core/property-paths/mixed-recursive-and-sequence-5.rq
index f10a3ac5b..f10a3ac5b 100644
--- a/tests/libtracker-data/property-paths/mixed-recursive-and-sequence-5.rq
+++ b/tests/core/property-paths/mixed-recursive-and-sequence-5.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-1.out b/tests/core/property-paths/negated-path-1.out
index ef0350743..ef0350743 100644
--- a/tests/libtracker-data/property-paths/negated-path-1.out
+++ b/tests/core/property-paths/negated-path-1.out
diff --git a/tests/libtracker-data/property-paths/negated-path-1.rq b/tests/core/property-paths/negated-path-1.rq
index 6c03cb750..6c03cb750 100644
--- a/tests/libtracker-data/property-paths/negated-path-1.rq
+++ b/tests/core/property-paths/negated-path-1.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-10.out b/tests/core/property-paths/negated-path-10.out
index d76316a4c..d76316a4c 100644
--- a/tests/libtracker-data/property-paths/negated-path-10.out
+++ b/tests/core/property-paths/negated-path-10.out
diff --git a/tests/libtracker-data/property-paths/negated-path-10.rq b/tests/core/property-paths/negated-path-10.rq
index 4c8db4ab4..4c8db4ab4 100644
--- a/tests/libtracker-data/property-paths/negated-path-10.rq
+++ b/tests/core/property-paths/negated-path-10.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-11.out b/tests/core/property-paths/negated-path-11.out
index 09b6f23e7..09b6f23e7 100644
--- a/tests/libtracker-data/property-paths/negated-path-11.out
+++ b/tests/core/property-paths/negated-path-11.out
diff --git a/tests/libtracker-data/property-paths/negated-path-11.rq b/tests/core/property-paths/negated-path-11.rq
index fca43d101..fca43d101 100644
--- a/tests/libtracker-data/property-paths/negated-path-11.rq
+++ b/tests/core/property-paths/negated-path-11.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-2.out b/tests/core/property-paths/negated-path-2.out
index ef0350743..ef0350743 100644
--- a/tests/libtracker-data/property-paths/negated-path-2.out
+++ b/tests/core/property-paths/negated-path-2.out
diff --git a/tests/libtracker-data/property-paths/negated-path-2.rq b/tests/core/property-paths/negated-path-2.rq
index 4cca76cf5..4cca76cf5 100644
--- a/tests/libtracker-data/property-paths/negated-path-2.rq
+++ b/tests/core/property-paths/negated-path-2.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-3.out b/tests/core/property-paths/negated-path-3.out
index ef0350743..ef0350743 100644
--- a/tests/libtracker-data/property-paths/negated-path-3.out
+++ b/tests/core/property-paths/negated-path-3.out
diff --git a/tests/libtracker-data/property-paths/negated-path-3.rq b/tests/core/property-paths/negated-path-3.rq
index 284b86b7b..284b86b7b 100644
--- a/tests/libtracker-data/property-paths/negated-path-3.rq
+++ b/tests/core/property-paths/negated-path-3.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-4.out b/tests/core/property-paths/negated-path-4.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/property-paths/negated-path-4.out
+++ b/tests/core/property-paths/negated-path-4.out
diff --git a/tests/libtracker-data/property-paths/negated-path-4.rq b/tests/core/property-paths/negated-path-4.rq
index 6186ff4b4..6186ff4b4 100644
--- a/tests/libtracker-data/property-paths/negated-path-4.rq
+++ b/tests/core/property-paths/negated-path-4.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-5.out b/tests/core/property-paths/negated-path-5.out
index ef0350743..ef0350743 100644
--- a/tests/libtracker-data/property-paths/negated-path-5.out
+++ b/tests/core/property-paths/negated-path-5.out
diff --git a/tests/libtracker-data/property-paths/negated-path-5.rq b/tests/core/property-paths/negated-path-5.rq
index 985b2a1f4..985b2a1f4 100644
--- a/tests/libtracker-data/property-paths/negated-path-5.rq
+++ b/tests/core/property-paths/negated-path-5.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-6.out b/tests/core/property-paths/negated-path-6.out
index ef0350743..ef0350743 100644
--- a/tests/libtracker-data/property-paths/negated-path-6.out
+++ b/tests/core/property-paths/negated-path-6.out
diff --git a/tests/libtracker-data/property-paths/negated-path-6.rq b/tests/core/property-paths/negated-path-6.rq
index e6c4b611b..e6c4b611b 100644
--- a/tests/libtracker-data/property-paths/negated-path-6.rq
+++ b/tests/core/property-paths/negated-path-6.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-7.out b/tests/core/property-paths/negated-path-7.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/property-paths/negated-path-7.out
+++ b/tests/core/property-paths/negated-path-7.out
diff --git a/tests/libtracker-data/property-paths/negated-path-7.rq b/tests/core/property-paths/negated-path-7.rq
index 19a1859f5..19a1859f5 100644
--- a/tests/libtracker-data/property-paths/negated-path-7.rq
+++ b/tests/core/property-paths/negated-path-7.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-8.out b/tests/core/property-paths/negated-path-8.out
index ef0350743..ef0350743 100644
--- a/tests/libtracker-data/property-paths/negated-path-8.out
+++ b/tests/core/property-paths/negated-path-8.out
diff --git a/tests/libtracker-data/property-paths/negated-path-8.rq b/tests/core/property-paths/negated-path-8.rq
index 0419f90af..0419f90af 100644
--- a/tests/libtracker-data/property-paths/negated-path-8.rq
+++ b/tests/core/property-paths/negated-path-8.rq
diff --git a/tests/libtracker-data/property-paths/negated-path-9.out b/tests/core/property-paths/negated-path-9.out
index d76316a4c..d76316a4c 100644
--- a/tests/libtracker-data/property-paths/negated-path-9.out
+++ b/tests/core/property-paths/negated-path-9.out
diff --git a/tests/libtracker-data/property-paths/negated-path-9.rq b/tests/core/property-paths/negated-path-9.rq
index 9c406c07e..9c406c07e 100644
--- a/tests/libtracker-data/property-paths/negated-path-9.rq
+++ b/tests/core/property-paths/negated-path-9.rq
diff --git a/tests/libtracker-data/property-paths/optional-path-1.out b/tests/core/property-paths/optional-path-1.out
index 525aee442..525aee442 100644
--- a/tests/libtracker-data/property-paths/optional-path-1.out
+++ b/tests/core/property-paths/optional-path-1.out
diff --git a/tests/libtracker-data/property-paths/optional-path-1.rq b/tests/core/property-paths/optional-path-1.rq
index d1da57abb..d1da57abb 100644
--- a/tests/libtracker-data/property-paths/optional-path-1.rq
+++ b/tests/core/property-paths/optional-path-1.rq
diff --git a/tests/libtracker-data/property-paths/optional-path-2.out b/tests/core/property-paths/optional-path-2.out
index 68ab274fe..68ab274fe 100644
--- a/tests/libtracker-data/property-paths/optional-path-2.out
+++ b/tests/core/property-paths/optional-path-2.out
diff --git a/tests/libtracker-data/property-paths/optional-path-2.rq b/tests/core/property-paths/optional-path-2.rq
index e151dcda5..e151dcda5 100644
--- a/tests/libtracker-data/property-paths/optional-path-2.rq
+++ b/tests/core/property-paths/optional-path-2.rq
diff --git a/tests/libtracker-data/property-paths/query-1.rq b/tests/core/property-paths/query-1.rq
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/property-paths/query-1.rq
+++ b/tests/core/property-paths/query-1.rq
diff --git a/tests/libtracker-data/property-paths/recursive-path-1.out b/tests/core/property-paths/recursive-path-1.out
index 525aee442..525aee442 100644
--- a/tests/libtracker-data/property-paths/recursive-path-1.out
+++ b/tests/core/property-paths/recursive-path-1.out
diff --git a/tests/libtracker-data/property-paths/recursive-path-1.rq b/tests/core/property-paths/recursive-path-1.rq
index 9bd80f372..9bd80f372 100644
--- a/tests/libtracker-data/property-paths/recursive-path-1.rq
+++ b/tests/core/property-paths/recursive-path-1.rq
diff --git a/tests/libtracker-data/property-paths/recursive-path-2.out b/tests/core/property-paths/recursive-path-2.out
index a02d506ff..a02d506ff 100644
--- a/tests/libtracker-data/property-paths/recursive-path-2.out
+++ b/tests/core/property-paths/recursive-path-2.out
diff --git a/tests/libtracker-data/property-paths/recursive-path-2.rq b/tests/core/property-paths/recursive-path-2.rq
index 1ed508ee4..1ed508ee4 100644
--- a/tests/libtracker-data/property-paths/recursive-path-2.rq
+++ b/tests/core/property-paths/recursive-path-2.rq
diff --git a/tests/libtracker-data/property-paths/recursive-path-3.out b/tests/core/property-paths/recursive-path-3.out
index 68ab274fe..68ab274fe 100644
--- a/tests/libtracker-data/property-paths/recursive-path-3.out
+++ b/tests/core/property-paths/recursive-path-3.out
diff --git a/tests/libtracker-data/property-paths/recursive-path-3.rq b/tests/core/property-paths/recursive-path-3.rq
index ae8ff050e..ae8ff050e 100644
--- a/tests/libtracker-data/property-paths/recursive-path-3.rq
+++ b/tests/core/property-paths/recursive-path-3.rq
diff --git a/tests/libtracker-data/property-paths/sequence-path-1.out b/tests/core/property-paths/sequence-path-1.out
index d12a7b1c3..d12a7b1c3 100644
--- a/tests/libtracker-data/property-paths/sequence-path-1.out
+++ b/tests/core/property-paths/sequence-path-1.out
diff --git a/tests/libtracker-data/property-paths/sequence-path-1.rq b/tests/core/property-paths/sequence-path-1.rq
index a703adf55..a703adf55 100644
--- a/tests/libtracker-data/property-paths/sequence-path-1.rq
+++ b/tests/core/property-paths/sequence-path-1.rq
diff --git a/tests/libtracker-data/property-paths/sequence-path-2.out b/tests/core/property-paths/sequence-path-2.out
index 312a17008..312a17008 100644
--- a/tests/libtracker-data/property-paths/sequence-path-2.out
+++ b/tests/core/property-paths/sequence-path-2.out
diff --git a/tests/libtracker-data/property-paths/sequence-path-2.rq b/tests/core/property-paths/sequence-path-2.rq
index 2fbc0642f..2fbc0642f 100644
--- a/tests/libtracker-data/property-paths/sequence-path-2.rq
+++ b/tests/core/property-paths/sequence-path-2.rq
diff --git a/tests/libtracker-data/property-paths/sequence-path-3.out b/tests/core/property-paths/sequence-path-3.out
index 0686dec37..0686dec37 100644
--- a/tests/libtracker-data/property-paths/sequence-path-3.out
+++ b/tests/core/property-paths/sequence-path-3.out
diff --git a/tests/libtracker-data/property-paths/sequence-path-3.rq b/tests/core/property-paths/sequence-path-3.rq
index 3cdee92a9..3cdee92a9 100644
--- a/tests/libtracker-data/property-paths/sequence-path-3.rq
+++ b/tests/core/property-paths/sequence-path-3.rq
diff --git a/tests/libtracker-data/property-paths/test.ontology b/tests/core/property-paths/test.ontology
index 0bf2b345f..0bf2b345f 100644
--- a/tests/libtracker-data/property-paths/test.ontology
+++ b/tests/core/property-paths/test.ontology
diff --git a/tests/libtracker-data/regex/regex-data-01.ttl b/tests/core/regex/regex-data-01.ttl
index 76e620b33..76e620b33 100755
--- a/tests/libtracker-data/regex/regex-data-01.ttl
+++ b/tests/core/regex/regex-data-01.ttl
diff --git a/tests/libtracker-data/regex/regex-query-001.extra.out b/tests/core/regex/regex-query-001.extra.out
index 22292dd2b..22292dd2b 100644
--- a/tests/libtracker-data/regex/regex-query-001.extra.out
+++ b/tests/core/regex/regex-query-001.extra.out
diff --git a/tests/libtracker-data/regex/regex-query-001.extra.rq b/tests/core/regex/regex-query-001.extra.rq
index 23f9c18ba..23f9c18ba 100755
--- a/tests/libtracker-data/regex/regex-query-001.extra.rq
+++ b/tests/core/regex/regex-query-001.extra.rq
diff --git a/tests/libtracker-data/regex/regex-query-001.out b/tests/core/regex/regex-query-001.out
index dae9fc885..dae9fc885 100755
--- a/tests/libtracker-data/regex/regex-query-001.out
+++ b/tests/core/regex/regex-query-001.out
diff --git a/tests/libtracker-data/regex/regex-query-001.rq b/tests/core/regex/regex-query-001.rq
index 3c8f66138..3c8f66138 100755
--- a/tests/libtracker-data/regex/regex-query-001.rq
+++ b/tests/core/regex/regex-query-001.rq
diff --git a/tests/libtracker-data/regex/regex-query-002.out b/tests/core/regex/regex-query-002.out
index aacdf9672..aacdf9672 100755
--- a/tests/libtracker-data/regex/regex-query-002.out
+++ b/tests/core/regex/regex-query-002.out
diff --git a/tests/libtracker-data/regex/regex-query-002.rq b/tests/core/regex/regex-query-002.rq
index b0bb7fde0..b0bb7fde0 100755
--- a/tests/libtracker-data/regex/regex-query-002.rq
+++ b/tests/core/regex/regex-query-002.rq
diff --git a/tests/libtracker-data/regex/test.ontology b/tests/core/regex/test.ontology
index 191fc804e..191fc804e 100644
--- a/tests/libtracker-data/regex/test.ontology
+++ b/tests/core/regex/test.ontology
diff --git a/tests/libtracker-data/run-test-in-tmp-dir.sh b/tests/core/run-test-in-tmp-dir.sh
index fbd5c10b7..fbd5c10b7 100644
--- a/tests/libtracker-data/run-test-in-tmp-dir.sh
+++ b/tests/core/run-test-in-tmp-dir.sh
diff --git a/tests/libtracker-data/service/service-after-triples-1.out b/tests/core/service/service-after-triples-1.out
index 5b6a80407..5b6a80407 100644
--- a/tests/libtracker-data/service/service-after-triples-1.out
+++ b/tests/core/service/service-after-triples-1.out
diff --git a/tests/libtracker-data/service/service-after-triples-1.rq b/tests/core/service/service-after-triples-1.rq
index fb06e12ed..fb06e12ed 100644
--- a/tests/libtracker-data/service/service-after-triples-1.rq
+++ b/tests/core/service/service-after-triples-1.rq
diff --git a/tests/libtracker-data/service/service-before-triples-1.out b/tests/core/service/service-before-triples-1.out
index 5b6a80407..5b6a80407 100644
--- a/tests/libtracker-data/service/service-before-triples-1.out
+++ b/tests/core/service/service-before-triples-1.out
diff --git a/tests/libtracker-data/service/service-before-triples-1.rq b/tests/core/service/service-before-triples-1.rq
index f867e97f9..f867e97f9 100644
--- a/tests/libtracker-data/service/service-before-triples-1.rq
+++ b/tests/core/service/service-before-triples-1.rq
diff --git a/tests/libtracker-data/service/service-empty-1.out b/tests/core/service/service-empty-1.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/service/service-empty-1.out
+++ b/tests/core/service/service-empty-1.out
diff --git a/tests/libtracker-data/service/service-empty-1.rq b/tests/core/service/service-empty-1.rq
index 23136fa1f..23136fa1f 100644
--- a/tests/libtracker-data/service/service-empty-1.rq
+++ b/tests/core/service/service-empty-1.rq
diff --git a/tests/libtracker-data/service/service-empty-2.out b/tests/core/service/service-empty-2.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/service/service-empty-2.out
+++ b/tests/core/service/service-empty-2.out
diff --git a/tests/libtracker-data/service/service-empty-2.rq b/tests/core/service/service-empty-2.rq
index 3bd6a5f13..3bd6a5f13 100644
--- a/tests/libtracker-data/service/service-empty-2.rq
+++ b/tests/core/service/service-empty-2.rq
diff --git a/tests/libtracker-data/service/service-local-filter-1.out b/tests/core/service/service-local-filter-1.out
index 6d1fe6dc0..6d1fe6dc0 100644
--- a/tests/libtracker-data/service/service-local-filter-1.out
+++ b/tests/core/service/service-local-filter-1.out
diff --git a/tests/libtracker-data/service/service-local-filter-1.rq b/tests/core/service/service-local-filter-1.rq
index 5c8f8c1b9..5c8f8c1b9 100644
--- a/tests/libtracker-data/service/service-local-filter-1.rq
+++ b/tests/core/service/service-local-filter-1.rq
diff --git a/tests/libtracker-data/service/service-query-1.out b/tests/core/service/service-query-1.out
index 5b6a80407..5b6a80407 100644
--- a/tests/libtracker-data/service/service-query-1.out
+++ b/tests/core/service/service-query-1.out
diff --git a/tests/libtracker-data/service/service-query-1.rq b/tests/core/service/service-query-1.rq
index 6ca52b186..6ca52b186 100644
--- a/tests/libtracker-data/service/service-query-1.rq
+++ b/tests/core/service/service-query-1.rq
diff --git a/tests/libtracker-data/service/service-union-with-local-1.out b/tests/core/service/service-union-with-local-1.out
index f4626ba3a..f4626ba3a 100644
--- a/tests/libtracker-data/service/service-union-with-local-1.out
+++ b/tests/core/service/service-union-with-local-1.out
diff --git a/tests/libtracker-data/service/service-union-with-local-1.rq b/tests/core/service/service-union-with-local-1.rq
index 098604a54..098604a54 100644
--- a/tests/libtracker-data/service/service-union-with-local-1.rq
+++ b/tests/core/service/service-union-with-local-1.rq
diff --git a/tests/libtracker-data/service/service-union-with-local-2.out b/tests/core/service/service-union-with-local-2.out
index 6eed860fd..6eed860fd 100644
--- a/tests/libtracker-data/service/service-union-with-local-2.out
+++ b/tests/core/service/service-union-with-local-2.out
diff --git a/tests/libtracker-data/service/service-union-with-local-2.rq b/tests/core/service/service-union-with-local-2.rq
index 1d3df0d69..1d3df0d69 100644
--- a/tests/libtracker-data/service/service-union-with-local-2.rq
+++ b/tests/core/service/service-union-with-local-2.rq
diff --git a/tests/libtracker-data/service/service-union-with-local-3.out b/tests/core/service/service-union-with-local-3.out
index 6eed860fd..6eed860fd 100644
--- a/tests/libtracker-data/service/service-union-with-local-3.out
+++ b/tests/core/service/service-union-with-local-3.out
diff --git a/tests/libtracker-data/service/service-union-with-local-3.rq b/tests/core/service/service-union-with-local-3.rq
index 45105baf4..45105baf4 100644
--- a/tests/libtracker-data/service/service-union-with-local-3.rq
+++ b/tests/core/service/service-union-with-local-3.rq
diff --git a/tests/libtracker-data/service/service-var-1.out b/tests/core/service/service-var-1.out
index 5b6a80407..5b6a80407 100644
--- a/tests/libtracker-data/service/service-var-1.out
+++ b/tests/core/service/service-var-1.out
diff --git a/tests/libtracker-data/service/service-var-1.rq b/tests/core/service/service-var-1.rq
index cc5342dbd..cc5342dbd 100644
--- a/tests/libtracker-data/service/service-var-1.rq
+++ b/tests/core/service/service-var-1.rq
diff --git a/tests/libtracker-data/service/service-var-2.out b/tests/core/service/service-var-2.out
index 5b6a80407..5b6a80407 100644
--- a/tests/libtracker-data/service/service-var-2.out
+++ b/tests/core/service/service-var-2.out
diff --git a/tests/libtracker-data/service/service-var-2.rq b/tests/core/service/service-var-2.rq
index 5e8bca2dd..5e8bca2dd 100644
--- a/tests/libtracker-data/service/service-var-2.rq
+++ b/tests/core/service/service-var-2.rq
diff --git a/tests/libtracker-data/sort/data-sort-1.ttl b/tests/core/sort/data-sort-1.ttl
index b459187e0..b459187e0 100755
--- a/tests/libtracker-data/sort/data-sort-1.ttl
+++ b/tests/core/sort/data-sort-1.ttl
diff --git a/tests/libtracker-data/sort/data-sort-3.ttl b/tests/core/sort/data-sort-3.ttl
index dc2cd3464..dc2cd3464 100755
--- a/tests/libtracker-data/sort/data-sort-3.ttl
+++ b/tests/core/sort/data-sort-3.ttl
diff --git a/tests/libtracker-data/sort/data-sort-4.ttl b/tests/core/sort/data-sort-4.ttl
index 173f38d32..173f38d32 100755
--- a/tests/libtracker-data/sort/data-sort-4.ttl
+++ b/tests/core/sort/data-sort-4.ttl
diff --git a/tests/libtracker-data/sort/data-sort-5.ttl b/tests/core/sort/data-sort-5.ttl
index d0b6611cc..d0b6611cc 100755
--- a/tests/libtracker-data/sort/data-sort-5.ttl
+++ b/tests/core/sort/data-sort-5.ttl
diff --git a/tests/libtracker-data/sort/data-title-sort-1.ttl b/tests/core/sort/data-title-sort-1.ttl
index e877edbe8..e877edbe8 100644
--- a/tests/libtracker-data/sort/data-title-sort-1.ttl
+++ b/tests/core/sort/data-title-sort-1.ttl
diff --git a/tests/libtracker-data/sort/query-sort-1.out b/tests/core/sort/query-sort-1.out
index a0dc77220..a0dc77220 100755
--- a/tests/libtracker-data/sort/query-sort-1.out
+++ b/tests/core/sort/query-sort-1.out
diff --git a/tests/libtracker-data/sort/query-sort-1.rq b/tests/core/sort/query-sort-1.rq
index 28a46543b..28a46543b 100755
--- a/tests/libtracker-data/sort/query-sort-1.rq
+++ b/tests/core/sort/query-sort-1.rq
diff --git a/tests/libtracker-data/sort/query-sort-2.out b/tests/core/sort/query-sort-2.out
index 5676037cd..5676037cd 100755
--- a/tests/libtracker-data/sort/query-sort-2.out
+++ b/tests/core/sort/query-sort-2.out
diff --git a/tests/libtracker-data/sort/query-sort-2.rq b/tests/core/sort/query-sort-2.rq
index 096f93992..096f93992 100755
--- a/tests/libtracker-data/sort/query-sort-2.rq
+++ b/tests/core/sort/query-sort-2.rq
diff --git a/tests/libtracker-data/sort/query-sort-3.out b/tests/core/sort/query-sort-3.out
index 8d46aded0..8d46aded0 100755
--- a/tests/libtracker-data/sort/query-sort-3.out
+++ b/tests/core/sort/query-sort-3.out
diff --git a/tests/libtracker-data/sort/query-sort-3.rq b/tests/core/sort/query-sort-3.rq
index 6c6a45daf..6c6a45daf 100755
--- a/tests/libtracker-data/sort/query-sort-3.rq
+++ b/tests/core/sort/query-sort-3.rq
diff --git a/tests/libtracker-data/sort/query-sort-4.out b/tests/core/sort/query-sort-4.out
index 0d1a2e81d..0d1a2e81d 100755
--- a/tests/libtracker-data/sort/query-sort-4.out
+++ b/tests/core/sort/query-sort-4.out
diff --git a/tests/libtracker-data/sort/query-sort-4.rq b/tests/core/sort/query-sort-4.rq
index a3fb54e66..a3fb54e66 100755
--- a/tests/libtracker-data/sort/query-sort-4.rq
+++ b/tests/core/sort/query-sort-4.rq
diff --git a/tests/libtracker-data/sort/query-sort-5.out b/tests/core/sort/query-sort-5.out
index 86b445dbd..86b445dbd 100755
--- a/tests/libtracker-data/sort/query-sort-5.out
+++ b/tests/core/sort/query-sort-5.out
diff --git a/tests/libtracker-data/sort/query-sort-5.rq b/tests/core/sort/query-sort-5.rq
index 564fba391..564fba391 100755
--- a/tests/libtracker-data/sort/query-sort-5.rq
+++ b/tests/core/sort/query-sort-5.rq
diff --git a/tests/libtracker-data/sort/query-sort-6.out b/tests/core/sort/query-sort-6.out
index e52c6635c..e52c6635c 100644
--- a/tests/libtracker-data/sort/query-sort-6.out
+++ b/tests/core/sort/query-sort-6.out
diff --git a/tests/libtracker-data/sort/query-sort-6.rq b/tests/core/sort/query-sort-6.rq
index e1eb1af8f..e1eb1af8f 100755
--- a/tests/libtracker-data/sort/query-sort-6.rq
+++ b/tests/core/sort/query-sort-6.rq
diff --git a/tests/libtracker-data/sort/query-sort-7.out b/tests/core/sort/query-sort-7.out
index a0dc77220..a0dc77220 100644
--- a/tests/libtracker-data/sort/query-sort-7.out
+++ b/tests/core/sort/query-sort-7.out
diff --git a/tests/libtracker-data/sort/query-sort-7.rq b/tests/core/sort/query-sort-7.rq
index f0c7d4283..f0c7d4283 100644
--- a/tests/libtracker-data/sort/query-sort-7.rq
+++ b/tests/core/sort/query-sort-7.rq
diff --git a/tests/libtracker-data/sort/query-sort-8.out b/tests/core/sort/query-sort-8.out
index 754fb7f82..754fb7f82 100644
--- a/tests/libtracker-data/sort/query-sort-8.out
+++ b/tests/core/sort/query-sort-8.out
diff --git a/tests/libtracker-data/sort/query-sort-8.rq b/tests/core/sort/query-sort-8.rq
index f34f69dc4..f34f69dc4 100644
--- a/tests/libtracker-data/sort/query-sort-8.rq
+++ b/tests/core/sort/query-sort-8.rq
diff --git a/tests/libtracker-data/sort/query-sort-9.out b/tests/core/sort/query-sort-9.out
index 754fb7f82..754fb7f82 100644
--- a/tests/libtracker-data/sort/query-sort-9.out
+++ b/tests/core/sort/query-sort-9.out
diff --git a/tests/libtracker-data/sort/query-sort-9.rq b/tests/core/sort/query-sort-9.rq
index 53b5aab79..53b5aab79 100644
--- a/tests/libtracker-data/sort/query-sort-9.rq
+++ b/tests/core/sort/query-sort-9.rq
diff --git a/tests/libtracker-data/sort/query-title-sort-1.out b/tests/core/sort/query-title-sort-1.out
index 20749b4df..20749b4df 100644
--- a/tests/libtracker-data/sort/query-title-sort-1.out
+++ b/tests/core/sort/query-title-sort-1.out
diff --git a/tests/libtracker-data/sort/query-title-sort-1.rq b/tests/core/sort/query-title-sort-1.rq
index 8256937c3..8256937c3 100644
--- a/tests/libtracker-data/sort/query-title-sort-1.rq
+++ b/tests/core/sort/query-title-sort-1.rq
diff --git a/tests/libtracker-data/sort/test.ontology b/tests/core/sort/test.ontology
index 1617b4bd9..1617b4bd9 100644
--- a/tests/libtracker-data/sort/test.ontology
+++ b/tests/core/sort/test.ontology
diff --git a/tests/libtracker-data/subqueries/data-1.ttl b/tests/core/subqueries/data-1.ttl
index f616e55ee..f616e55ee 100644
--- a/tests/libtracker-data/subqueries/data-1.ttl
+++ b/tests/core/subqueries/data-1.ttl
diff --git a/tests/libtracker-data/subqueries/subqueries-1.out b/tests/core/subqueries/subqueries-1.out
index 905166a84..905166a84 100644
--- a/tests/libtracker-data/subqueries/subqueries-1.out
+++ b/tests/core/subqueries/subqueries-1.out
diff --git a/tests/libtracker-data/subqueries/subqueries-1.rq b/tests/core/subqueries/subqueries-1.rq
index c32f97512..c32f97512 100644
--- a/tests/libtracker-data/subqueries/subqueries-1.rq
+++ b/tests/core/subqueries/subqueries-1.rq
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-1.out b/tests/core/subqueries/subqueries-minus-1.out
index 7baa303ae..7baa303ae 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-1.out
+++ b/tests/core/subqueries/subqueries-minus-1.out
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-1.rq b/tests/core/subqueries/subqueries-minus-1.rq
index 0268be189..0268be189 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-1.rq
+++ b/tests/core/subqueries/subqueries-minus-1.rq
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-2.out b/tests/core/subqueries/subqueries-minus-2.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-2.out
+++ b/tests/core/subqueries/subqueries-minus-2.out
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-2.rq b/tests/core/subqueries/subqueries-minus-2.rq
index 81dc02fa6..81dc02fa6 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-2.rq
+++ b/tests/core/subqueries/subqueries-minus-2.rq
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-3.out b/tests/core/subqueries/subqueries-minus-3.out
index 7baa303ae..7baa303ae 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-3.out
+++ b/tests/core/subqueries/subqueries-minus-3.out
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-3.rq b/tests/core/subqueries/subqueries-minus-3.rq
index f61a92f92..f61a92f92 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-3.rq
+++ b/tests/core/subqueries/subqueries-minus-3.rq
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-4.out b/tests/core/subqueries/subqueries-minus-4.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-4.out
+++ b/tests/core/subqueries/subqueries-minus-4.out
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-4.rq b/tests/core/subqueries/subqueries-minus-4.rq
index b8367e2f7..b8367e2f7 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-4.rq
+++ b/tests/core/subqueries/subqueries-minus-4.rq
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-5.out b/tests/core/subqueries/subqueries-minus-5.out
index 4eca2a7c0..4eca2a7c0 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-5.out
+++ b/tests/core/subqueries/subqueries-minus-5.out
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-5.rq b/tests/core/subqueries/subqueries-minus-5.rq
index 8038da4f0..8038da4f0 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-5.rq
+++ b/tests/core/subqueries/subqueries-minus-5.rq
diff --git a/tests/libtracker-data/subqueries/subqueries-union-1.out b/tests/core/subqueries/subqueries-union-1.out
index a8d859d1f..a8d859d1f 100644
--- a/tests/libtracker-data/subqueries/subqueries-union-1.out
+++ b/tests/core/subqueries/subqueries-union-1.out
diff --git a/tests/libtracker-data/subqueries/subqueries-union-1.rq b/tests/core/subqueries/subqueries-union-1.rq
index c3248b336..c3248b336 100644
--- a/tests/libtracker-data/subqueries/subqueries-union-1.rq
+++ b/tests/core/subqueries/subqueries-union-1.rq
diff --git a/tests/libtracker-data/subqueries/subqueries-union-2.out b/tests/core/subqueries/subqueries-union-2.out
index 2de3f5d52..2de3f5d52 100644
--- a/tests/libtracker-data/subqueries/subqueries-union-2.out
+++ b/tests/core/subqueries/subqueries-union-2.out
diff --git a/tests/libtracker-data/subqueries/subqueries-union-2.rq b/tests/core/subqueries/subqueries-union-2.rq
index a19870f6d..a19870f6d 100644
--- a/tests/libtracker-data/subqueries/subqueries-union-2.rq
+++ b/tests/core/subqueries/subqueries-union-2.rq
diff --git a/tests/libtracker-data/subqueries/subqueries-union-3.out b/tests/core/subqueries/subqueries-union-3.out
index d445a12f9..d445a12f9 100644
--- a/tests/libtracker-data/subqueries/subqueries-union-3.out
+++ b/tests/core/subqueries/subqueries-union-3.out
diff --git a/tests/libtracker-data/subqueries/subqueries-union-3.rq b/tests/core/subqueries/subqueries-union-3.rq
index 443736f8f..443736f8f 100644
--- a/tests/libtracker-data/subqueries/subqueries-union-3.rq
+++ b/tests/core/subqueries/subqueries-union-3.rq
diff --git a/tests/libtracker-data/subqueries/subqueries-union-4.out b/tests/core/subqueries/subqueries-union-4.out
index 9aac76e5b..9aac76e5b 100644
--- a/tests/libtracker-data/subqueries/subqueries-union-4.out
+++ b/tests/core/subqueries/subqueries-union-4.out
diff --git a/tests/libtracker-data/subqueries/subqueries-union-4.rq b/tests/core/subqueries/subqueries-union-4.rq
index 6d656adf3..6d656adf3 100644
--- a/tests/libtracker-data/subqueries/subqueries-union-4.rq
+++ b/tests/core/subqueries/subqueries-union-4.rq
diff --git a/tests/libtracker-data/subqueries/test.ontology b/tests/core/subqueries/test.ontology
index c9f95d740..c9f95d740 100644
--- a/tests/libtracker-data/subqueries/test.ontology
+++ b/tests/core/subqueries/test.ontology
diff --git a/tests/libtracker-data/tracker-insert-or-replace-test.c b/tests/core/tracker-insert-or-replace-test.c
index f731ae2e5..698e34095 100644
--- a/tests/libtracker-data/tracker-insert-or-replace-test.c
+++ b/tests/core/tracker-insert-or-replace-test.c
@@ -174,7 +174,7 @@ main (int argc, char *argv[])
 	g_object_unref (cache);
 	g_object_unref (ontology);
 
-	g_print ("ok 1 /libtracker-data/insert-or-replace\n");
+	g_print ("ok 1 /core/insert-or-replace\n");
 
 	return 0;
 }
diff --git a/tests/libtracker-data/tracker-ontology-change-test.c b/tests/core/tracker-ontology-change-test.c
index 62e45041d..e353aa606 100644
--- a/tests/libtracker-data/tracker-ontology-change-test.c
+++ b/tests/core/tracker-ontology-change-test.c
@@ -174,8 +174,8 @@ test_ontology_change (void)
 	GFile *data_location, *test_schemas;
 	TrackerSparqlConnection *conn;
 
-	prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "libtracker-data", NULL);
-	build_prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_BUILDDIR, "tests", "libtracker-data", NULL);
+	prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "core", NULL);
+	build_prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_BUILDDIR, "tests", "core", NULL);
 	ontologies = g_build_filename (prefix, "ontologies", NULL);
 
 	ontology_file = g_build_path (G_DIR_SEPARATOR_S, build_prefix, "change", "ontologies", "99-example.ontology", NULL);
@@ -300,7 +300,7 @@ main (int argc, char **argv)
 
 	g_test_init (&argc, &argv, NULL);
 
-	g_test_add_func ("/libtracker-data/ontology-change", test_ontology_change);
+	g_test_add_func ("/core/ontology-change", test_ontology_change);
 	result = g_test_run ();
 
 	return result;
diff --git a/tests/libtracker-data/tracker-ontology-error-test.c b/tests/core/tracker-ontology-error-test.c
index c79680410..e206b37fc 100644
--- a/tests/libtracker-data/tracker-ontology-error-test.c
+++ b/tests/core/tracker-ontology-error-test.c
@@ -186,8 +186,8 @@ test_ontology_error (void)
 	GFile *test_ontology_file;
 	GFile *test_schemas;
 
-	prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "libtracker-data", NULL);
-	build_prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_BUILDDIR, "tests", "libtracker-data", NULL);
+	prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "core", NULL);
+	build_prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_BUILDDIR, "tests", "core", NULL);
 
 	// Create a temporary directory inside the build directory to store in it the ontology that will be tested
 	test_ontology_dir = g_build_path (G_DIR_SEPARATOR_S, build_prefix, "ontology-error", "ontologies", NULL);
@@ -259,7 +259,7 @@ main (int argc, char **argv)
 
 	g_test_init (&argc, &argv, NULL);
 
-	g_test_add_func ("/libtracker-data/ontology-error", test_ontology_error);
+	g_test_add_func ("/core/ontology-error", test_ontology_error);
 	result = g_test_run ();
 
 	return result;
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/core/tracker-ontology-test.c
index 8f8ef81d4..f013e7c8d 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/core/tracker-ontology-test.c
@@ -200,7 +200,7 @@ test_query (TestInfo      *test_info,
 
 	data_location = g_file_new_for_path (test_info->data_location);
 
-	prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "libtracker-data", NULL);
+	prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "core", NULL);
 	data_prefix = g_build_filename (prefix, test_info->data, NULL);
 	test_prefix = g_build_filename (prefix, test_info->test_name, NULL);
 	g_free (prefix);
@@ -296,12 +296,12 @@ main (int argc, char **argv)
 	g_test_init (&argc, &argv, NULL);
 
 	/* add test cases */
-	g_test_add ("/libtracker-data/ontology-init", TestInfo, &all_other_tests[0], setup, test_ontology_init, teardown);
+	g_test_add ("/core/ontology-init", TestInfo, &all_other_tests[0], setup, test_ontology_init, teardown);
 
 	for (i = 0; nie_tests[i].test_name; i++) {
 		gchar *testpath;
 
-		testpath = g_strconcat ("/libtracker-data/nie/", nie_tests[i].test_name, NULL);
+		testpath = g_strconcat ("/core/nie/", nie_tests[i].test_name, NULL);
 		g_test_add (testpath, TestInfo, &nie_tests[i], setup, test_query, teardown);
 		g_free (testpath);
 	}
diff --git a/tests/libtracker-data/tracker-service-test.c b/tests/core/tracker-service-test.c
index ba4d60150..6b75d71d7 100644
--- a/tests/libtracker-data/tracker-service-test.c
+++ b/tests/core/tracker-service-test.c
@@ -189,7 +189,7 @@ test_sparql_query (TestInfo      *test_info,
 	GThread *thread;
 
 	/* initialization */
-	prefix = g_build_filename (TOP_SRCDIR, "tests", "libtracker-data", NULL);
+	prefix = g_build_filename (TOP_SRCDIR, "tests", "core", NULL);
 	test_prefix = g_build_filename (prefix, test_info->test_name, NULL);
 	g_free (prefix);
 
@@ -290,7 +290,7 @@ main (int argc, char **argv)
 	for (i = 0; i < G_N_ELEMENTS (tests); i++) {
 		gchar *testpath;
 
-		testpath = g_strconcat ("/libtracker-data/dbus/", tests[i].test_name, NULL);
+		testpath = g_strconcat ("/core/dbus/", tests[i].test_name, NULL);
 		g_test_add (testpath, TestInfo, &tests[i], setup, test_sparql_query, teardown);
 		g_free (testpath);
 	}
@@ -299,7 +299,7 @@ main (int argc, char **argv)
 	for (i = 0; i < G_N_ELEMENTS (tests); i++) {
 		gchar *testpath;
 
-		testpath = g_strconcat ("/libtracker-data/local/", tests[i].test_name, NULL);
+		testpath = g_strconcat ("/core/local/", tests[i].test_name, NULL);
 		g_test_add (testpath, TestInfo, &tests[i], setup_local, test_sparql_query, teardown);
 		g_free (testpath);
 	}
diff --git a/tests/libtracker-data/tracker-sparql-blank-test.c b/tests/core/tracker-sparql-blank-test.c
index 6b4f139e4..856ef2f4e 100644
--- a/tests/libtracker-data/tracker-sparql-blank-test.c
+++ b/tests/core/tracker-sparql-blank-test.c
@@ -165,7 +165,7 @@ main (int argc, char **argv)
 
 	g_test_init (&argc, &argv, NULL);
 
-	g_test_add ("/libtracker-data/sparql-blank", TestInfo, NULL, setup, test_blank, teardown);
+	g_test_add ("/core/sparql-blank", TestInfo, NULL, setup, test_blank, teardown);
 
 	/* run tests */
 	result = g_test_run ();
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/core/tracker-sparql-test.c
index 6b8f38b19..a02d294e2 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/core/tracker-sparql-test.c
@@ -499,7 +499,7 @@ test_sparql_query (TestInfo      *test_info,
 	TrackerSparqlConnection *conn;
 
 	/* initialization */
-	prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "libtracker-data", NULL);
+	prefix = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "core", NULL);
 	data_prefix = g_build_filename (prefix, test_info->data, NULL);
 	test_prefix = g_build_filename (prefix, test_info->test_name, NULL);
 	g_free (prefix);
@@ -512,7 +512,7 @@ test_sparql_query (TestInfo      *test_info,
 	                                      NULL, test_schemas, NULL, &error);
 	g_assert_no_error (error);
 
-	/* data_path = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "libtracker-data", NULL); */
+	/* data_path = g_build_path (G_DIR_SEPARATOR_S, TOP_SRCDIR, "tests", "core", NULL); */
 
 	/* load data set */
 	data_filename = g_strconcat (data_prefix, ".ttl", NULL);
@@ -637,7 +637,7 @@ main (int argc, char **argv)
 		}
 #endif
 
-		testpath = g_strconcat ("/libtracker-data/sparql/", tests[i].test_name, NULL);
+		testpath = g_strconcat ("/core/sparql/", tests[i].test_name, NULL);
 		g_test_add (testpath, TestInfo, &tests[i], setup, test_sparql_query, teardown);
 		g_free (testpath);
 	}
diff --git a/tests/libtracker-data/turtle-comments/test.ontology b/tests/core/turtle-comments/test.ontology
index def641e13..def641e13 100644
--- a/tests/libtracker-data/turtle-comments/test.ontology
+++ b/tests/core/turtle-comments/test.ontology
diff --git a/tests/libtracker-data/turtle-comments/turtle-data-001.ttl b/tests/core/turtle-comments/turtle-data-001.ttl
index bf53d21f5..bf53d21f5 100755
--- a/tests/libtracker-data/turtle-comments/turtle-data-001.ttl
+++ b/tests/core/turtle-comments/turtle-data-001.ttl
diff --git a/tests/libtracker-data/turtle-comments/turtle-query-001.out b/tests/core/turtle-comments/turtle-query-001.out
index 17a15e29d..17a15e29d 100755
--- a/tests/libtracker-data/turtle-comments/turtle-query-001.out
+++ b/tests/core/turtle-comments/turtle-query-001.out
diff --git a/tests/libtracker-data/turtle-comments/turtle-query-001.rq b/tests/core/turtle-comments/turtle-query-001.rq
index 96693ca5b..96693ca5b 100755
--- a/tests/libtracker-data/turtle-comments/turtle-query-001.rq
+++ b/tests/core/turtle-comments/turtle-query-001.rq
diff --git a/tests/libtracker-data/turtle/test.ontology b/tests/core/turtle/test.ontology
index 648342cf4..648342cf4 100644
--- a/tests/libtracker-data/turtle/test.ontology
+++ b/tests/core/turtle/test.ontology
diff --git a/tests/libtracker-data/turtle/turtle-data-001.ttl b/tests/core/turtle/turtle-data-001.ttl
index bf53d21f5..bf53d21f5 100755
--- a/tests/libtracker-data/turtle/turtle-data-001.ttl
+++ b/tests/core/turtle/turtle-data-001.ttl
diff --git a/tests/libtracker-data/turtle/turtle-data-002.ttl b/tests/core/turtle/turtle-data-002.ttl
index e8d21a66d..e8d21a66d 100755
--- a/tests/libtracker-data/turtle/turtle-data-002.ttl
+++ b/tests/core/turtle/turtle-data-002.ttl
diff --git a/tests/libtracker-data/turtle/turtle-query-001.out b/tests/core/turtle/turtle-query-001.out
index 17a15e29d..17a15e29d 100755
--- a/tests/libtracker-data/turtle/turtle-query-001.out
+++ b/tests/core/turtle/turtle-query-001.out
diff --git a/tests/libtracker-data/turtle/turtle-query-001.rq b/tests/core/turtle/turtle-query-001.rq
index 96693ca5b..96693ca5b 100755
--- a/tests/libtracker-data/turtle/turtle-query-001.rq
+++ b/tests/core/turtle/turtle-query-001.rq
diff --git a/tests/libtracker-data/turtle/turtle-query-002.out b/tests/core/turtle/turtle-query-002.out
index e69de29bb..e69de29bb 100755
--- a/tests/libtracker-data/turtle/turtle-query-002.out
+++ b/tests/core/turtle/turtle-query-002.out
diff --git a/tests/libtracker-data/turtle/turtle-query-002.rq b/tests/core/turtle/turtle-query-002.rq
index b032949b2..b032949b2 100755
--- a/tests/libtracker-data/turtle/turtle-query-002.rq
+++ b/tests/core/turtle/turtle-query-002.rq
diff --git a/tests/libtracker-data/unbound/data.ontology b/tests/core/unbound/data.ontology
index bd22eee3e..bd22eee3e 100644
--- a/tests/libtracker-data/unbound/data.ontology
+++ b/tests/core/unbound/data.ontology
diff --git a/tests/libtracker-data/unbound/data.ttl b/tests/core/unbound/data.ttl
index 7ee5d37d1..7ee5d37d1 100644
--- a/tests/libtracker-data/unbound/data.ttl
+++ b/tests/core/unbound/data.ttl
diff --git a/tests/libtracker-data/unbound/unbound-1.out b/tests/core/unbound/unbound-1.out
index 8b1378917..8b1378917 100644
--- a/tests/libtracker-data/unbound/unbound-1.out
+++ b/tests/core/unbound/unbound-1.out
diff --git a/tests/libtracker-data/unbound/unbound-1.rq b/tests/core/unbound/unbound-1.rq
index ad775ebdb..ad775ebdb 100644
--- a/tests/libtracker-data/unbound/unbound-1.rq
+++ b/tests/core/unbound/unbound-1.rq
diff --git a/tests/libtracker-data/unbound/unbound-2.out b/tests/core/unbound/unbound-2.out
index 139597f9c..139597f9c 100644
--- a/tests/libtracker-data/unbound/unbound-2.out
+++ b/tests/core/unbound/unbound-2.out
diff --git a/tests/libtracker-data/unbound/unbound-2.rq b/tests/core/unbound/unbound-2.rq
index fdbf6a33b..fdbf6a33b 100644
--- a/tests/libtracker-data/unbound/unbound-2.rq
+++ b/tests/core/unbound/unbound-2.rq
diff --git a/tests/libtracker-data/unbound/unbound-3.out b/tests/core/unbound/unbound-3.out
index 8b1378917..8b1378917 100644
--- a/tests/libtracker-data/unbound/unbound-3.out
+++ b/tests/core/unbound/unbound-3.out
diff --git a/tests/libtracker-data/unbound/unbound-3.rq b/tests/core/unbound/unbound-3.rq
index d4c976f98..d4c976f98 100644
--- a/tests/libtracker-data/unbound/unbound-3.rq
+++ b/tests/core/unbound/unbound-3.rq
diff --git a/tests/libtracker-data/unbound/unbound-4.out b/tests/core/unbound/unbound-4.out
index 25cadbeeb..25cadbeeb 100644
--- a/tests/libtracker-data/unbound/unbound-4.out
+++ b/tests/core/unbound/unbound-4.out
diff --git a/tests/libtracker-data/unbound/unbound-4.rq b/tests/core/unbound/unbound-4.rq
index cc3e0912b..cc3e0912b 100644
--- a/tests/libtracker-data/unbound/unbound-4.rq
+++ b/tests/core/unbound/unbound-4.rq
diff --git a/tests/libtracker-data/unbound/unbound-5.out b/tests/core/unbound/unbound-5.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/unbound/unbound-5.out
+++ b/tests/core/unbound/unbound-5.out
diff --git a/tests/libtracker-data/unbound/unbound-5.rq b/tests/core/unbound/unbound-5.rq
index 260e25c04..260e25c04 100644
--- a/tests/libtracker-data/unbound/unbound-5.rq
+++ b/tests/core/unbound/unbound-5.rq
diff --git a/tests/libtracker-data/update/delete-data-1.rq b/tests/core/update/delete-data-1.rq
index 73e6f7d97..73e6f7d97 100644
--- a/tests/libtracker-data/update/delete-data-1.rq
+++ b/tests/core/update/delete-data-1.rq
diff --git a/tests/libtracker-data/update/delete-data-2.rq b/tests/core/update/delete-data-2.rq
index f77c00d7a..f77c00d7a 100644
--- a/tests/libtracker-data/update/delete-data-2.rq
+++ b/tests/core/update/delete-data-2.rq
diff --git a/tests/libtracker-data/update/delete-data-query-1.out b/tests/core/update/delete-data-query-1.out
index 63ae18dc5..63ae18dc5 100644
--- a/tests/libtracker-data/update/delete-data-query-1.out
+++ b/tests/core/update/delete-data-query-1.out
diff --git a/tests/libtracker-data/update/delete-data-query-1.rq b/tests/core/update/delete-data-query-1.rq
index f80241f21..f80241f21 100644
--- a/tests/libtracker-data/update/delete-data-query-1.rq
+++ b/tests/core/update/delete-data-query-1.rq
diff --git a/tests/libtracker-data/update/delete-data-query-2.out b/tests/core/update/delete-data-query-2.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/update/delete-data-query-2.out
+++ b/tests/core/update/delete-data-query-2.out
diff --git a/tests/libtracker-data/update/delete-data-query-2.rq b/tests/core/update/delete-data-query-2.rq
index f80241f21..f80241f21 100644
--- a/tests/libtracker-data/update/delete-data-query-2.rq
+++ b/tests/core/update/delete-data-query-2.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-1.rq b/tests/core/update/delete-insert-where-1.rq
index 5dd305e21..5dd305e21 100644
--- a/tests/libtracker-data/update/delete-insert-where-1.rq
+++ b/tests/core/update/delete-insert-where-1.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-2.rq b/tests/core/update/delete-insert-where-2.rq
index a371f2a7b..a371f2a7b 100644
--- a/tests/libtracker-data/update/delete-insert-where-2.rq
+++ b/tests/core/update/delete-insert-where-2.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-3.rq b/tests/core/update/delete-insert-where-3.rq
index 9484dabf9..9484dabf9 100644
--- a/tests/libtracker-data/update/delete-insert-where-3.rq
+++ b/tests/core/update/delete-insert-where-3.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-4.rq b/tests/core/update/delete-insert-where-4.rq
index 694e59027..694e59027 100644
--- a/tests/libtracker-data/update/delete-insert-where-4.rq
+++ b/tests/core/update/delete-insert-where-4.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-5.rq b/tests/core/update/delete-insert-where-5.rq
index e7b6b9c30..e7b6b9c30 100644
--- a/tests/libtracker-data/update/delete-insert-where-5.rq
+++ b/tests/core/update/delete-insert-where-5.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-6.rq b/tests/core/update/delete-insert-where-6.rq
index 64f1f704f..64f1f704f 100644
--- a/tests/libtracker-data/update/delete-insert-where-6.rq
+++ b/tests/core/update/delete-insert-where-6.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-query-1.out b/tests/core/update/delete-insert-where-query-1.out
index b894cc7e0..b894cc7e0 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-1.out
+++ b/tests/core/update/delete-insert-where-query-1.out
diff --git a/tests/libtracker-data/update/delete-insert-where-query-1.rq b/tests/core/update/delete-insert-where-query-1.rq
index c21c1d009..c21c1d009 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-1.rq
+++ b/tests/core/update/delete-insert-where-query-1.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-query-2.out b/tests/core/update/delete-insert-where-query-2.out
index b894cc7e0..b894cc7e0 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-2.out
+++ b/tests/core/update/delete-insert-where-query-2.out
diff --git a/tests/libtracker-data/update/delete-insert-where-query-2.rq b/tests/core/update/delete-insert-where-query-2.rq
index c21c1d009..c21c1d009 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-2.rq
+++ b/tests/core/update/delete-insert-where-query-2.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-query-3.out b/tests/core/update/delete-insert-where-query-3.out
index 35f20a63f..35f20a63f 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-3.out
+++ b/tests/core/update/delete-insert-where-query-3.out
diff --git a/tests/libtracker-data/update/delete-insert-where-query-3.rq b/tests/core/update/delete-insert-where-query-3.rq
index f80241f21..f80241f21 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-3.rq
+++ b/tests/core/update/delete-insert-where-query-3.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-query-4.out b/tests/core/update/delete-insert-where-query-4.out
index b894cc7e0..b894cc7e0 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-4.out
+++ b/tests/core/update/delete-insert-where-query-4.out
diff --git a/tests/libtracker-data/update/delete-insert-where-query-4.rq b/tests/core/update/delete-insert-where-query-4.rq
index f80241f21..f80241f21 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-4.rq
+++ b/tests/core/update/delete-insert-where-query-4.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-query-5.out b/tests/core/update/delete-insert-where-query-5.out
index 34e099240..34e099240 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-5.out
+++ b/tests/core/update/delete-insert-where-query-5.out
diff --git a/tests/libtracker-data/update/delete-insert-where-query-5.rq b/tests/core/update/delete-insert-where-query-5.rq
index f80241f21..f80241f21 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-5.rq
+++ b/tests/core/update/delete-insert-where-query-5.rq
diff --git a/tests/libtracker-data/update/delete-insert-where-query-6.out b/tests/core/update/delete-insert-where-query-6.out
index 6199c07de..6199c07de 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-6.out
+++ b/tests/core/update/delete-insert-where-query-6.out
diff --git a/tests/libtracker-data/update/delete-insert-where-query-6.rq b/tests/core/update/delete-insert-where-query-6.rq
index c0d71d689..c0d71d689 100644
--- a/tests/libtracker-data/update/delete-insert-where-query-6.rq
+++ b/tests/core/update/delete-insert-where-query-6.rq
diff --git a/tests/libtracker-data/update/delete-where-1.rq b/tests/core/update/delete-where-1.rq
index b23d6e789..b23d6e789 100644
--- a/tests/libtracker-data/update/delete-where-1.rq
+++ b/tests/core/update/delete-where-1.rq
diff --git a/tests/libtracker-data/update/delete-where-2.rq b/tests/core/update/delete-where-2.rq
index 0af348e39..0af348e39 100644
--- a/tests/libtracker-data/update/delete-where-2.rq
+++ b/tests/core/update/delete-where-2.rq
diff --git a/tests/libtracker-data/update/delete-where-3.rq b/tests/core/update/delete-where-3.rq
index 2d236089b..2d236089b 100644
--- a/tests/libtracker-data/update/delete-where-3.rq
+++ b/tests/core/update/delete-where-3.rq
diff --git a/tests/libtracker-data/update/delete-where-query-1.out b/tests/core/update/delete-where-query-1.out
index 3ea6bd49a..3ea6bd49a 100644
--- a/tests/libtracker-data/update/delete-where-query-1.out
+++ b/tests/core/update/delete-where-query-1.out
diff --git a/tests/libtracker-data/update/delete-where-query-1.rq b/tests/core/update/delete-where-query-1.rq
index f80241f21..f80241f21 100644
--- a/tests/libtracker-data/update/delete-where-query-1.rq
+++ b/tests/core/update/delete-where-query-1.rq
diff --git a/tests/libtracker-data/update/delete-where-query-2.out b/tests/core/update/delete-where-query-2.out
index decefb9d3..decefb9d3 100644
--- a/tests/libtracker-data/update/delete-where-query-2.out
+++ b/tests/core/update/delete-where-query-2.out
diff --git a/tests/libtracker-data/update/delete-where-query-2.rq b/tests/core/update/delete-where-query-2.rq
index 1bbc75a29..1bbc75a29 100644
--- a/tests/libtracker-data/update/delete-where-query-2.rq
+++ b/tests/core/update/delete-where-query-2.rq
diff --git a/tests/libtracker-data/update/delete-where-query-3.out b/tests/core/update/delete-where-query-3.out
index 14e945cec..14e945cec 100644
--- a/tests/libtracker-data/update/delete-where-query-3.out
+++ b/tests/core/update/delete-where-query-3.out
diff --git a/tests/libtracker-data/update/delete-where-query-3.rq b/tests/core/update/delete-where-query-3.rq
index ee1e9e4a9..ee1e9e4a9 100644
--- a/tests/libtracker-data/update/delete-where-query-3.rq
+++ b/tests/core/update/delete-where-query-3.rq
diff --git a/tests/libtracker-data/update/insert-data-1.rq b/tests/core/update/insert-data-1.rq
index a67e61fab..a67e61fab 100644
--- a/tests/libtracker-data/update/insert-data-1.rq
+++ b/tests/core/update/insert-data-1.rq
diff --git a/tests/libtracker-data/update/insert-data-2.rq b/tests/core/update/insert-data-2.rq
index e0dc23cea..e0dc23cea 100644
--- a/tests/libtracker-data/update/insert-data-2.rq
+++ b/tests/core/update/insert-data-2.rq
diff --git a/tests/libtracker-data/update/insert-data-query-1.out b/tests/core/update/insert-data-query-1.out
index 374a3b2d7..374a3b2d7 100644
--- a/tests/libtracker-data/update/insert-data-query-1.out
+++ b/tests/core/update/insert-data-query-1.out
diff --git a/tests/libtracker-data/update/insert-data-query-1.rq b/tests/core/update/insert-data-query-1.rq
index c21c1d009..c21c1d009 100644
--- a/tests/libtracker-data/update/insert-data-query-1.rq
+++ b/tests/core/update/insert-data-query-1.rq
diff --git a/tests/libtracker-data/update/insert-data-query-2.out b/tests/core/update/insert-data-query-2.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/update/insert-data-query-2.out
+++ b/tests/core/update/insert-data-query-2.out
diff --git a/tests/libtracker-data/update/insert-data-query-2.rq b/tests/core/update/insert-data-query-2.rq
index c21c1d009..c21c1d009 100644
--- a/tests/libtracker-data/update/insert-data-query-2.rq
+++ b/tests/core/update/insert-data-query-2.rq
diff --git a/tests/libtracker-data/update/insert-date-with-offset-1.rq b/tests/core/update/insert-date-with-offset-1.rq
index 592e42b23..592e42b23 100644
--- a/tests/libtracker-data/update/insert-date-with-offset-1.rq
+++ b/tests/core/update/insert-date-with-offset-1.rq
diff --git a/tests/libtracker-data/update/invalid-insert-where-1.rq b/tests/core/update/invalid-insert-where-1.rq
index 01205f9e1..01205f9e1 100644
--- a/tests/libtracker-data/update/invalid-insert-where-1.rq
+++ b/tests/core/update/invalid-insert-where-1.rq
diff --git a/tests/libtracker-data/update/invalid-insert-where-query-1.out b/tests/core/update/invalid-insert-where-query-1.out
index e69de29bb..e69de29bb 100644
--- a/tests/libtracker-data/update/invalid-insert-where-query-1.out
+++ b/tests/core/update/invalid-insert-where-query-1.out
diff --git a/tests/libtracker-data/update/invalid-insert-where-query-1.rq b/tests/core/update/invalid-insert-where-query-1.rq
index c21c1d009..c21c1d009 100644
--- a/tests/libtracker-data/update/invalid-insert-where-query-1.rq
+++ b/tests/core/update/invalid-insert-where-query-1.rq
diff --git a/tests/libtracker-data/update/select-date-with-offset-1.out b/tests/core/update/select-date-with-offset-1.out
index d11948b9b..d11948b9b 100644
--- a/tests/libtracker-data/update/select-date-with-offset-1.out
+++ b/tests/core/update/select-date-with-offset-1.out
diff --git a/tests/libtracker-data/update/select-date-with-offset-1.rq b/tests/core/update/select-date-with-offset-1.rq
index a3d27ebc4..a3d27ebc4 100644
--- a/tests/libtracker-data/update/select-date-with-offset-1.rq
+++ b/tests/core/update/select-date-with-offset-1.rq
diff --git a/tests/libtracker-data/update/test.ontology b/tests/core/update/test.ontology
index cadbf7bb4..cadbf7bb4 100644
--- a/tests/libtracker-data/update/test.ontology
+++ b/tests/core/update/test.ontology
diff --git a/tests/meson.build b/tests/meson.build
index 11fb725cf..2bfb58d28 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -9,8 +9,8 @@ subdir('common')
 
 subdir('gvdb')
 subdir('fts')
+subdir('core')
 subdir('libtracker-common')
-subdir('libtracker-data')
 subdir('libtracker-sparql')
 subdir('functional-tests')
 subdir('services')