[tracker/wip/carlosg/shuffle-dirs: 12/15] tests: Rename libtracker-data tests to 'core'




commit 26decd7b7cefa7e76a1a86a8ca8b21aff1cb9904
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Apr 3 14:36:10 2022 +0200

    tests: Rename libtracker-data tests to 'core'
    
    Abandon the static library name for these tests.

 tests/{libtracker-data => core}/.gitignore                  |   0
 tests/{libtracker-data => core}/aggregates/aggregate-1.out  |   0
 tests/{libtracker-data => core}/aggregates/aggregate-1.rq   |   0
 .../aggregates/aggregate-count-1.out                        |   0
 .../aggregates/aggregate-count-1.rq                         |   0
 .../aggregates/aggregate-count-2.out                        |   0
 .../aggregates/aggregate-count-2.rq                         |   0
 .../aggregates/aggregate-count-3.out                        |   0
 .../aggregates/aggregate-count-3.rq                         |   0
 .../aggregates/aggregate-distinct-1.out                     |   0
 .../aggregates/aggregate-distinct-1.rq                      |   0
 .../aggregates/aggregate-group-1.out                        |   0
 .../aggregates/aggregate-group-1.rq                         |   0
 .../aggregates/aggregate-group-2.out                        |   0
 .../aggregates/aggregate-group-2.rq                         |   0
 .../aggregates/aggregate-group-3.out                        |   0
 .../aggregates/aggregate-group-3.rq                         |   0
 .../aggregates/aggregate-group-as-1.out                     |   0
 .../aggregates/aggregate-group-as-1.rq                      |   0
 .../aggregates/aggregate-group-having-1.out                 |   0
 .../aggregates/aggregate-group-having-1.rq                  |   0
 .../aggregates/aggregate-sample-1.out                       |   0
 .../aggregates/aggregate-sample-1.rq                        |   0
 .../aggregates/aggregate-sample-2.out                       |   0
 .../aggregates/aggregate-sample-2.rq                        |   0
 tests/{libtracker-data => core}/aggregates/data-1.ttl       |   0
 tests/{libtracker-data => core}/aggregates/test.ontology    |   0
 tests/{libtracker-data => core}/algebra/data-1.ttl          |   0
 tests/{libtracker-data => core}/algebra/data-2.ttl          |   0
 tests/{libtracker-data => core}/algebra/filter-in-1.out     |   0
 tests/{libtracker-data => core}/algebra/filter-in-1.rq      |   0
 tests/{libtracker-data => core}/algebra/filter-in-2.out     |   0
 tests/{libtracker-data => core}/algebra/filter-in-2.rq      |   0
 tests/{libtracker-data => core}/algebra/filter-in-3.out     |   0
 tests/{libtracker-data => core}/algebra/filter-in-3.rq      |   0
 tests/{libtracker-data => core}/algebra/filter-in-4.out     |   0
 tests/{libtracker-data => core}/algebra/filter-in-4.rq      |   0
 tests/{libtracker-data => core}/algebra/filter-in-5.out     |   0
 tests/{libtracker-data => core}/algebra/filter-in-5.rq      |   0
 tests/{libtracker-data => core}/algebra/filter-nested-1.out |   0
 tests/{libtracker-data => core}/algebra/filter-nested-1.rq  |   0
 tests/{libtracker-data => core}/algebra/filter-nested-2.out |   0
 tests/{libtracker-data => core}/algebra/filter-nested-2.rq  |   0
 .../algebra/filter-placement-1.out                          |   0
 .../{libtracker-data => core}/algebra/filter-placement-1.rq |   0
 .../algebra/filter-placement-2.out                          |   0
 .../{libtracker-data => core}/algebra/filter-placement-2.rq |   0
 .../algebra/filter-placement-3.out                          |   0
 .../{libtracker-data => core}/algebra/filter-placement-3.rq |   0
 .../algebra/filter-placement-3a.out                         |   0
 .../algebra/filter-placement-3a.rq                          |   0
 tests/{libtracker-data => core}/algebra/filter-scope-1.out  |   0
 tests/{libtracker-data => core}/algebra/filter-scope-1.rq   |   0
 .../{libtracker-data => core}/algebra/modifier-limit-1.out  |   0
 tests/{libtracker-data => core}/algebra/modifier-limit-1.rq |   0
 .../algebra/modifier-limit-offset-1.out                     |   0
 .../algebra/modifier-limit-offset-1.rq                      |   0
 .../algebra/modifier-limit-offset-2.out                     |   0
 .../algebra/modifier-limit-offset-2.rq                      |   0
 .../{libtracker-data => core}/algebra/modifier-offset-1.out |   0
 .../{libtracker-data => core}/algebra/modifier-offset-1.rq  |   0
 tests/{libtracker-data => core}/algebra/opt-filter-3.out    |   0
 tests/{libtracker-data => core}/algebra/opt-filter-3.rq     |   0
 tests/{libtracker-data => core}/algebra/opt-filter-3.ttl    |   0
 tests/{libtracker-data => core}/algebra/test-1.ontology     |   0
 tests/{libtracker-data => core}/algebra/test-2.ontology     |   0
 .../algebra/two-nested-opt-alt.out                          |   0
 .../{libtracker-data => core}/algebra/two-nested-opt-alt.rq |   0
 tests/{libtracker-data => core}/algebra/two-nested-opt.out  |   0
 tests/{libtracker-data => core}/algebra/two-nested-opt.rq   |   0
 tests/{libtracker-data => core}/algebra/two-nested-opt.ttl  |   0
 .../{libtracker-data => core}/algebra/var-scope-join-1.out  |   0
 tests/{libtracker-data => core}/algebra/var-scope-join-1.rq |   0
 .../{libtracker-data => core}/algebra/var-scope-join-1.ttl  |   0
 tests/{libtracker-data => core}/anon/data.ttl               |   0
 tests/{libtracker-data => core}/anon/query-2.out            |   0
 tests/{libtracker-data => core}/anon/query-2.rq             |   0
 tests/{libtracker-data => core}/anon/query-3.out            |   0
 tests/{libtracker-data => core}/anon/query-3.rq             |   0
 tests/{libtracker-data => core}/anon/query-4.out            |   0
 tests/{libtracker-data => core}/anon/query-4.rq             |   0
 tests/{libtracker-data => core}/anon/query-5.out            |   0
 tests/{libtracker-data => core}/anon/query-5.rq             |   0
 tests/{libtracker-data => core}/anon/query.out              |   0
 tests/{libtracker-data => core}/anon/query.rq               |   0
 tests/{libtracker-data => core}/anon/test.ontology          |   0
 tests/{libtracker-data => core}/ask/ask-1.out               |   0
 tests/{libtracker-data => core}/ask/ask-1.rq                |   0
 tests/{libtracker-data => core}/ask/data.ontology           |   0
 tests/{libtracker-data => core}/ask/data.ttl                |   0
 tests/{libtracker-data => core}/basic/base-1.out            |   0
 tests/{libtracker-data => core}/basic/base-1.rq             |   0
 tests/{libtracker-data => core}/basic/base-prefix-3.out     |   0
 tests/{libtracker-data => core}/basic/base-prefix-3.rq      |   0
 .../{libtracker-data => core}/basic/codepoint-escaping.out  |   0
 tests/{libtracker-data => core}/basic/codepoint-escaping.rq |   0
 tests/{libtracker-data => core}/basic/compare-cast.out      |   0
 tests/{libtracker-data => core}/basic/compare-cast.rq       |   0
 tests/{libtracker-data => core}/basic/data-1.ttl            |   0
 tests/{libtracker-data => core}/basic/long-strings.out      |   0
 tests/{libtracker-data => core}/basic/long-strings.rq       |   0
 .../basic/predicate-variable-2.out                          |   0
 .../{libtracker-data => core}/basic/predicate-variable-2.rq |   0
 .../basic/predicate-variable-3.out                          |   0
 .../{libtracker-data => core}/basic/predicate-variable-3.rq |   0
 .../basic/predicate-variable-4.out                          |   0
 .../{libtracker-data => core}/basic/predicate-variable-4.rq |   0
 .../{libtracker-data => core}/basic/predicate-variable.out  |   0
 tests/{libtracker-data => core}/basic/predicate-variable.rq |   0
 tests/{libtracker-data => core}/basic/test.ontology         |   0
 tests/{libtracker-data => core}/basic/urn-in-as.out         |   0
 tests/{libtracker-data => core}/basic/urn-in-as.rq          |   0
 .../bind/bind-reused-different-patterns.out                 |   0
 .../bind/bind-reused-different-patterns.rq                  |   0
 tests/{libtracker-data => core}/bind/bind1.out              |   0
 tests/{libtracker-data => core}/bind/bind1.rq               |   0
 tests/{libtracker-data => core}/bind/bind2.out              |   0
 tests/{libtracker-data => core}/bind/bind2.rq               |   0
 tests/{libtracker-data => core}/bind/bind3.out              |   0
 tests/{libtracker-data => core}/bind/bind3.rq               |   0
 tests/{libtracker-data => core}/bind/bind4.out              |   0
 tests/{libtracker-data => core}/bind/bind4.rq               |   0
 tests/{libtracker-data => core}/bind/bind5.out              |   0
 tests/{libtracker-data => core}/bind/bind5.rq               |   0
 tests/{libtracker-data => core}/bind/bind6.out              |   0
 tests/{libtracker-data => core}/bind/bind6.rq               |   0
 tests/{libtracker-data => core}/bind/bind7.out              |   0
 tests/{libtracker-data => core}/bind/bind7.rq               |   0
 tests/{libtracker-data => core}/bind/data.ontology          |   0
 tests/{libtracker-data => core}/bind/data.ttl               |   0
 .../bnode-coreference/data.ontology                         |   0
 tests/{libtracker-data => core}/bnode-coreference/data.ttl  |   0
 tests/{libtracker-data => core}/bnode-coreference/query.out |   0
 tests/{libtracker-data => core}/bnode-coreference/query.rq  |   0
 tests/{libtracker-data => core}/bnode/data.ontology         |   0
 tests/{libtracker-data => core}/bnode/data.ttl              |   0
 tests/{libtracker-data => core}/bnode/query-1.out           |   0
 tests/{libtracker-data => core}/bnode/query-1.rq            |   0
 tests/{libtracker-data => core}/bnode/query-2.out           |   0
 tests/{libtracker-data => core}/bnode/query-2.rq            |   0
 tests/{libtracker-data => core}/bnode/query-3.out           |   0
 tests/{libtracker-data => core}/bnode/query-3.rq            |   0
 tests/{libtracker-data => core}/bnode/query-4.out           |   0
 tests/{libtracker-data => core}/bnode/query-4.rq            |   0
 tests/{libtracker-data => core}/bnode/query-5.out           |   0
 tests/{libtracker-data => core}/bnode/query-5.rq            |   0
 tests/{libtracker-data => core}/bound/bound1.out            |   0
 tests/{libtracker-data => core}/bound/bound1.rq             |   0
 tests/{libtracker-data => core}/bound/data.ontology         |   0
 tests/{libtracker-data => core}/bound/data.ttl              |   0
 tests/{libtracker-data => core}/change/change-test-1.out    |   0
 tests/{libtracker-data => core}/change/change-test-1.rq     |   0
 tests/{libtracker-data => core}/change/change-test-2.out    |   0
 tests/{libtracker-data => core}/change/change-test-2.rq     |   0
 tests/{libtracker-data => core}/change/change-test-3.out    |   0
 tests/{libtracker-data => core}/change/change-test-3.rq     |   0
 tests/{libtracker-data => core}/change/change-test-4.out    |   0
 tests/{libtracker-data => core}/change/change-test-4.rq     |   0
 tests/{libtracker-data => core}/change/change-test-5.out    |   0
 tests/{libtracker-data => core}/change/change-test-5.rq     |   0
 tests/{libtracker-data => core}/change/change-test-6.out    |   0
 tests/{libtracker-data => core}/change/change-test-6.rq     |   0
 .../change/source/99-example.ontology.v1                    |   0
 .../change/source/99-example.ontology.v10                   |   0
 .../change/source/99-example.ontology.v11                   |   0
 .../change/source/99-example.ontology.v12                   |   0
 .../change/source/99-example.ontology.v13                   |   0
 .../change/source/99-example.ontology.v2                    |   0
 .../change/source/99-example.ontology.v3                    |   0
 .../change/source/99-example.ontology.v4                    |   0
 .../change/source/99-example.ontology.v5                    |   0
 .../change/source/99-example.ontology.v6                    |   0
 .../change/source/99-example.ontology.v7                    |   0
 .../change/source/99-example.ontology.v8                    |   0
 .../change/source/99-example.ontology.v9                    |   0
 tests/{libtracker-data => core}/change/test-1.out           |   0
 tests/{libtracker-data => core}/change/test-1.rq            |   0
 tests/{libtracker-data => core}/change/test-2.out           |   0
 tests/{libtracker-data => core}/change/test-2.rq            |   0
 tests/{libtracker-data => core}/change/test-3.out           |   0
 tests/{libtracker-data => core}/change/test-3.rq            |   0
 tests/{libtracker-data => core}/change/test-4.out           |   0
 tests/{libtracker-data => core}/change/test-4.rq            |   0
 tests/{libtracker-data => core}/change/test-5.out           |   0
 tests/{libtracker-data => core}/change/test-5.rq            |   0
 .../change/updates/99-example.queries.v10                   |   0
 .../change/updates/99-example.queries.v11                   |   0
 .../change/updates/99-example.queries.v2                    |   0
 .../change/updates/99-example.queries.v3                    |   0
 .../change/updates/99-example.queries.v4                    |   0
 .../change/updates/99-example.queries.v5                    |   0
 .../change/updates/99-example.queries.v6                    |   0
 .../change/updates/99-example.queries.v7                    |   0
 .../change/updates/99-example.queries.v8                    |   0
 .../change/updates/99-example.queries.v9                    |   0
 tests/{libtracker-data => core}/constraint/coexisting-1.out |   0
 tests/{libtracker-data => core}/constraint/coexisting-1.rq  |   0
 tests/{libtracker-data => core}/constraint/coexisting-2.out |   0
 tests/{libtracker-data => core}/constraint/coexisting-2.rq  |   0
 tests/{libtracker-data => core}/constraint/coexisting-3.out |   0
 tests/{libtracker-data => core}/constraint/coexisting-3.rq  |   0
 tests/{libtracker-data => core}/constraint/coexisting-4.out |   0
 tests/{libtracker-data => core}/constraint/coexisting-4.rq  |   0
 tests/{libtracker-data => core}/constraint/data.rq          |   0
 .../{libtracker-data => core}/constraint/empty-graph-1.out  |   0
 tests/{libtracker-data => core}/constraint/empty-graph-1.rq |   0
 .../{libtracker-data => core}/constraint/empty-graph-2.out  |   0
 tests/{libtracker-data => core}/constraint/empty-graph-2.rq |   0
 .../{libtracker-data => core}/constraint/empty-graph-3.out  |   0
 tests/{libtracker-data => core}/constraint/empty-graph-3.rq |   0
 .../{libtracker-data => core}/constraint/empty-graph-4.out  |   0
 tests/{libtracker-data => core}/constraint/empty-graph-4.rq |   0
 tests/{libtracker-data => core}/constraint/nested-1.out     |   0
 tests/{libtracker-data => core}/constraint/nested-1.rq      |   0
 tests/{libtracker-data => core}/constraint/nested-2.out     |   0
 tests/{libtracker-data => core}/constraint/nested-2.rq      |   0
 tests/{libtracker-data => core}/constraint/nested-3.out     |   0
 tests/{libtracker-data => core}/constraint/nested-3.rq      |   0
 tests/{libtracker-data => core}/constraint/nested-4.out     |   0
 tests/{libtracker-data => core}/constraint/nested-4.rq      |   0
 tests/{libtracker-data => core}/constraint/nested-5.out     |   0
 tests/{libtracker-data => core}/constraint/nested-5.rq      |   0
 tests/{libtracker-data => core}/constraint/nested-6.out     |   0
 tests/{libtracker-data => core}/constraint/nested-6.rq      |   0
 tests/{libtracker-data => core}/constraint/test.ontology    |   0
 .../construct/construct-pattern.out                         |   0
 .../construct/construct-pattern.rq                          |   0
 .../{libtracker-data => core}/construct/construct-where.out |   0
 .../{libtracker-data => core}/construct/construct-where.rq  |   0
 .../construct/construct-with-modifiers.out                  |   0
 .../construct/construct-with-modifiers.rq                   |   0
 tests/{libtracker-data => core}/construct/data.ttl          |   0
 tests/{libtracker-data => core}/construct/test.ontology     |   0
 tests/{libtracker-data => core}/datetime/data-1.ttl         |   0
 tests/{libtracker-data => core}/datetime/data-2.ttl         |   0
 tests/{libtracker-data => core}/datetime/data-3.rq          |   0
 tests/{libtracker-data => core}/datetime/data-4.rq          |   0
 tests/{libtracker-data => core}/datetime/delete-1.out       |   0
 tests/{libtracker-data => core}/datetime/delete-1.rq        |   0
 tests/{libtracker-data => core}/datetime/direct-1.out       |   0
 tests/{libtracker-data => core}/datetime/direct-1.rq        |   0
 tests/{libtracker-data => core}/datetime/filter-1.out       |   0
 tests/{libtracker-data => core}/datetime/filter-1.rq        |   0
 tests/{libtracker-data => core}/datetime/filter-2.out       |   0
 tests/{libtracker-data => core}/datetime/filter-2.rq        |   0
 tests/{libtracker-data => core}/datetime/filter-3.out       |   0
 tests/{libtracker-data => core}/datetime/filter-3.rq        |   0
 tests/{libtracker-data => core}/datetime/filter-4.out       |   0
 tests/{libtracker-data => core}/datetime/filter-4.rq        |   0
 tests/{libtracker-data => core}/datetime/filter-5.out       |   0
 tests/{libtracker-data => core}/datetime/filter-5.rq        |   0
 .../datetime/functions-localtime-1.out                      |   0
 .../datetime/functions-localtime-1.rq                       |   0
 .../datetime/functions-timezone-1.out                       |   0
 .../datetime/functions-timezone-1.rq                        |   0
 .../datetime/functions-timezone-2.out                       |   0
 .../datetime/functions-timezone-2.rq                        |   0
 .../datetime/functions-timezone-3.out                       |   0
 .../datetime/functions-timezone-3.rq                        |   0
 tests/{libtracker-data => core}/datetime/functions-tz-1.out |   0
 tests/{libtracker-data => core}/datetime/functions-tz-1.rq  |   0
 tests/{libtracker-data => core}/datetime/insert-1.out       |   0
 tests/{libtracker-data => core}/datetime/insert-1.rq        |   0
 tests/{libtracker-data => core}/datetime/test.ontology      |   0
 tests/{libtracker-data => core}/dawg-testcases              |   0
 tests/{libtracker-data => core}/describe/data.ttl           |   0
 tests/{libtracker-data => core}/describe/describe-limit.out |   0
 tests/{libtracker-data => core}/describe/describe-limit.rq  |   0
 .../describe/describe-multiple.out                          |   0
 .../{libtracker-data => core}/describe/describe-multiple.rq |   0
 .../describe/describe-non-existent.out                      |   0
 .../describe/describe-non-existent.rq                       |   0
 .../{libtracker-data => core}/describe/describe-pattern.out |   0
 .../{libtracker-data => core}/describe/describe-pattern.rq  |   0
 .../{libtracker-data => core}/describe/describe-single.out  |   0
 tests/{libtracker-data => core}/describe/describe-single.rq |   0
 tests/{libtracker-data => core}/describe/test.ontology      |   0
 .../error/bind-reused-same-pattern.out                      |   0
 .../error/bind-reused-same-pattern.rq                       |   0
 tests/{libtracker-data => core}/error/query-error-1.out     |   0
 tests/{libtracker-data => core}/error/query-error-1.rq      |   0
 tests/{libtracker-data => core}/error/query-error-1.ttl     |   0
 tests/{libtracker-data => core}/error/query-error-2.out     |   0
 tests/{libtracker-data => core}/error/query-error-2.rq      |   0
 tests/{libtracker-data => core}/error/query-error-2.ttl     |   0
 tests/{libtracker-data => core}/error/test.ontology         |   0
 tests/{libtracker-data => core}/error/update-error-1.rq     |   0
 .../error/update-error-query-1.out                          |   0
 .../{libtracker-data => core}/error/update-error-query-1.rq |   0
 tests/{libtracker-data => core}/example.index               | Bin
 tests/{libtracker-data => core}/expr-ops/data.ontology      |   0
 tests/{libtracker-data => core}/expr-ops/data.ttl           |   0
 tests/{libtracker-data => core}/expr-ops/query-ge-1.out     |   0
 tests/{libtracker-data => core}/expr-ops/query-ge-1.rq      |   0
 tests/{libtracker-data => core}/expr-ops/query-le-1.out     |   0
 tests/{libtracker-data => core}/expr-ops/query-le-1.rq      |   0
 tests/{libtracker-data => core}/expr-ops/query-minus-1.out  |   0
 tests/{libtracker-data => core}/expr-ops/query-minus-1.rq   |   0
 tests/{libtracker-data => core}/expr-ops/query-mul-1.out    |   0
 tests/{libtracker-data => core}/expr-ops/query-mul-1.rq     |   0
 tests/{libtracker-data => core}/expr-ops/query-plus-1.out   |   0
 tests/{libtracker-data => core}/expr-ops/query-plus-1.rq    |   0
 tests/{libtracker-data => core}/expr-ops/query-res-1.out    |   0
 tests/{libtracker-data => core}/expr-ops/query-res-1.rq     |   0
 .../{libtracker-data => core}/expr-ops/query-unminus-1.out  |   0
 tests/{libtracker-data => core}/expr-ops/query-unminus-1.rq |   0
 tests/{libtracker-data => core}/expr-ops/query-unplus-1.out |   0
 tests/{libtracker-data => core}/expr-ops/query-unplus-1.rq  |   0
 tests/{libtracker-data => core}/functions/data-1.ttl        |   0
 tests/{libtracker-data => core}/functions/data-2.ttl        |   0
 tests/{libtracker-data => core}/functions/data-3.ttl        |   0
 tests/{libtracker-data => core}/functions/data-4.ttl        |   0
 tests/{libtracker-data => core}/functions/data-5.ttl        |   0
 .../functions/functions-builtin-abs-1.out                   |   0
 .../functions/functions-builtin-abs-1.rq                    |   0
 .../functions/functions-builtin-bnode-1.out                 |   0
 .../functions/functions-builtin-bnode-1.rq                  |   0
 .../functions/functions-builtin-bnode-2.out                 |   0
 .../functions/functions-builtin-bnode-2.rq                  |   0
 .../functions/functions-builtin-ceil-1.out                  |   0
 .../functions/functions-builtin-ceil-1.rq                   |   0
 .../functions/functions-builtin-contains-1.out              |   0
 .../functions/functions-builtin-contains-1.rq               |   0
 .../functions/functions-builtin-day-1.out                   |   0
 .../functions/functions-builtin-day-1.rq                    |   0
 .../functions/functions-builtin-encode-for-uri-1.out        |   0
 .../functions/functions-builtin-encode-for-uri-1.rq         |   0
 .../functions/functions-builtin-floor-1.out                 |   0
 .../functions/functions-builtin-floor-1.rq                  |   0
 .../functions/functions-builtin-hash-1.out                  |   0
 .../functions/functions-builtin-hash-1.rq                   |   0
 .../functions/functions-builtin-hours-1.out                 |   0
 .../functions/functions-builtin-hours-1.rq                  |   0
 .../functions/functions-builtin-if-1.out                    |   0
 .../functions/functions-builtin-if-1.rq                     |   0
 .../functions/functions-builtin-lcase-1.out                 |   0
 .../functions/functions-builtin-lcase-1.rq                  |   0
 .../functions/functions-builtin-minutes-1.out               |   0
 .../functions/functions-builtin-minutes-1.rq                |   0
 .../functions/functions-builtin-month-1.out                 |   0
 .../functions/functions-builtin-month-1.rq                  |   0
 .../functions/functions-builtin-now-1.out                   |   0
 .../functions/functions-builtin-now-1.rq                    |   0
 .../functions/functions-builtin-rand-1.out                  |   0
 .../functions/functions-builtin-rand-1.rq                   |   0
 .../functions/functions-builtin-replace-1.out               |   0
 .../functions/functions-builtin-replace-1.rq                |   0
 .../functions/functions-builtin-replace-2.out               |   0
 .../functions/functions-builtin-replace-2.rq                |   0
 .../functions/functions-builtin-replace-3.out               |   0
 .../functions/functions-builtin-replace-3.rq                |   0
 .../functions/functions-builtin-replace-4.out               |   0
 .../functions/functions-builtin-replace-4.rq                |   0
 .../functions/functions-builtin-replace-5.out               |   0
 .../functions/functions-builtin-replace-5.rq                |   0
 .../functions/functions-builtin-round-1.out                 |   0
 .../functions/functions-builtin-round-1.rq                  |   0
 .../functions/functions-builtin-sameterm-1.out              |   0
 .../functions/functions-builtin-sameterm-1.rq               |   0
 .../functions/functions-builtin-seconds-1.out               |   0
 .../functions/functions-builtin-seconds-1.rq                |   0
 .../functions/functions-builtin-strafter-1.out              |   0
 .../functions/functions-builtin-strafter-1.rq               |   0
 .../functions/functions-builtin-strbefore-1.out             |   0
 .../functions/functions-builtin-strbefore-1.rq              |   0
 .../functions/functions-builtin-strdt-1.out                 |   0
 .../functions/functions-builtin-strdt-1.rq                  |   0
 .../functions/functions-builtin-strlen-1.out                |   0
 .../functions/functions-builtin-strlen-1.rq                 |   0
 .../functions/functions-builtin-substr-1.out                |   0
 .../functions/functions-builtin-substr-1.rq                 |   0
 .../functions/functions-builtin-ucase-1.out                 |   0
 .../functions/functions-builtin-ucase-1.rq                  |   0
 .../functions/functions-builtin-uri-1.out                   |   0
 .../functions/functions-builtin-uri-1.rq                    |   0
 .../functions/functions-builtin-uuid-1.out                  |   0
 .../functions/functions-builtin-uuid-1.rq                   |   0
 .../functions/functions-builtin-year-1.out                  |   0
 .../functions/functions-builtin-year-1.rq                   |   0
 .../functions/functions-cast-1.out                          |   0
 .../{libtracker-data => core}/functions/functions-cast-1.rq |   0
 .../functions/functions-cast-2.out                          |   0
 .../{libtracker-data => core}/functions/functions-cast-2.rq |   0
 .../functions/functions-coalesce-1.out                      |   0
 .../functions/functions-coalesce-1.rq                       |   0
 .../functions/functions-datatypes-1.out                     |   0
 .../functions/functions-datatypes-1.rq                      |   0
 .../functions/functions-datatypes-2.out                     |   0
 .../functions/functions-datatypes-2.rq                      |   0
 .../functions/functions-datatypes-3.out                     |   0
 .../functions/functions-datatypes-3.rq                      |   0
 .../functions/functions-datatypes-4.out                     |   0
 .../functions/functions-datatypes-4.rq                      |   0
 .../functions/functions-datatypes-5.out                     |   0
 .../functions/functions-datatypes-5.rq                      |   0
 .../functions/functions-property-1.out                      |   0
 .../functions/functions-property-1.rq                       |   0
 .../functions/functions-property-2.out                      |   0
 .../functions/functions-property-2.rq                       |   0
 .../functions/functions-tracker-1.out                       |   0
 .../functions/functions-tracker-1.rq                        |   0
 .../functions/functions-tracker-2.out                       |   0
 .../functions/functions-tracker-2.rq                        |   0
 .../functions/functions-tracker-3.out                       |   0
 .../functions/functions-tracker-3.rq                        |   0
 .../functions/functions-tracker-4.out                       |   0
 .../functions/functions-tracker-4.rq                        |   0
 .../functions/functions-tracker-5.out                       |   0
 .../functions/functions-tracker-5.rq                        |   0
 .../functions/functions-tracker-6.out                       |   0
 .../functions/functions-tracker-6.rq                        |   0
 .../functions/functions-tracker-7.out                       |   0
 .../functions/functions-tracker-7.rq                        |   0
 .../functions/functions-tracker-8.out                       |   0
 .../functions/functions-tracker-8.rq                        |   0
 .../functions/functions-tracker-9.out                       |   0
 .../functions/functions-tracker-9.rq                        |   0
 .../functions/functions-tracker-loc-1.out                   |   0
 .../functions/functions-tracker-loc-1.rq                    |   0
 .../functions/functions-xpath-1.out                         |   0
 .../functions/functions-xpath-1.rq                          |   0
 .../functions/functions-xpath-10.out                        |   0
 .../functions/functions-xpath-10.rq                         |   0
 .../functions/functions-xpath-11.out                        |   0
 .../functions/functions-xpath-11.rq                         |   0
 .../functions/functions-xpath-12.out                        |   0
 .../functions/functions-xpath-12.rq                         |   0
 .../functions/functions-xpath-13.out                        |   0
 .../functions/functions-xpath-13.rq                         |   0
 .../functions/functions-xpath-14.out                        |   0
 .../functions/functions-xpath-14.rq                         |   0
 .../functions/functions-xpath-15.out                        |   0
 .../functions/functions-xpath-15.rq                         |   0
 .../functions/functions-xpath-2.out                         |   0
 .../functions/functions-xpath-2.rq                          |   0
 .../functions/functions-xpath-3.out                         |   0
 .../functions/functions-xpath-3.rq                          |   0
 .../functions/functions-xpath-4.out                         |   0
 .../functions/functions-xpath-4.rq                          |   0
 .../functions/functions-xpath-5.out                         |   0
 .../functions/functions-xpath-5.rq                          |   0
 .../functions/functions-xpath-6.out                         |   0
 .../functions/functions-xpath-6.rq                          |   0
 .../functions/functions-xpath-7.out                         |   0
 .../functions/functions-xpath-7.rq                          |   0
 .../functions/functions-xpath-8.out                         |   0
 .../functions/functions-xpath-8.rq                          |   0
 .../functions/functions-xpath-9.out                         |   0
 .../functions/functions-xpath-9.rq                          |   0
 tests/{libtracker-data => core}/functions/test-1.ontology   |   0
 tests/{libtracker-data => core}/functions/test-2.ontology   |   0
 tests/{libtracker-data => core}/graph/add-from-default.out  |   0
 tests/{libtracker-data => core}/graph/add-from-default.rq   |   0
 .../graph/add-from-non-existent.out                         |   0
 .../graph/add-from-non-existent.rq                          |   0
 tests/{libtracker-data => core}/graph/add-into-self.out     |   0
 tests/{libtracker-data => core}/graph/add-into-self.rq      |   0
 tests/{libtracker-data => core}/graph/add-to-default.out    |   0
 tests/{libtracker-data => core}/graph/add-to-default.rq     |   0
 tests/{libtracker-data => core}/graph/add-to-existent.out   |   0
 tests/{libtracker-data => core}/graph/add-to-existent.rq    |   0
 .../{libtracker-data => core}/graph/add-to-non-existent.out |   0
 .../{libtracker-data => core}/graph/add-to-non-existent.rq  |   0
 tests/{libtracker-data => core}/graph/add.out               |   0
 tests/{libtracker-data => core}/graph/add.rq                |   0
 tests/{libtracker-data => core}/graph/clear-all.out         |   0
 tests/{libtracker-data => core}/graph/clear-all.rq          |   0
 tests/{libtracker-data => core}/graph/clear-default.out     |   0
 tests/{libtracker-data => core}/graph/clear-default.rq      |   0
 tests/{libtracker-data => core}/graph/clear-named.out       |   0
 tests/{libtracker-data => core}/graph/clear-named.rq        |   0
 .../{libtracker-data => core}/graph/clear-non-existent.out  |   0
 tests/{libtracker-data => core}/graph/clear-non-existent.rq |   0
 tests/{libtracker-data => core}/graph/clear.out             |   0
 tests/{libtracker-data => core}/graph/clear.rq              |   0
 tests/{libtracker-data => core}/graph/copy-from-default.out |   0
 tests/{libtracker-data => core}/graph/copy-from-default.rq  |   0
 .../graph/copy-from-non-existent.out                        |   0
 .../graph/copy-from-non-existent.rq                         |   0
 tests/{libtracker-data => core}/graph/copy-into-self.out    |   0
 tests/{libtracker-data => core}/graph/copy-into-self.rq     |   0
 tests/{libtracker-data => core}/graph/copy-to-default.out   |   0
 tests/{libtracker-data => core}/graph/copy-to-default.rq    |   0
 tests/{libtracker-data => core}/graph/copy-to-existent.out  |   0
 tests/{libtracker-data => core}/graph/copy-to-existent.rq   |   0
 .../graph/copy-to-non-existent.out                          |   0
 .../{libtracker-data => core}/graph/copy-to-non-existent.rq |   0
 tests/{libtracker-data => core}/graph/copy.out              |   0
 tests/{libtracker-data => core}/graph/copy.rq               |   0
 tests/{libtracker-data => core}/graph/data-1.rq             |   0
 tests/{libtracker-data => core}/graph/data-2.rq             |   0
 tests/{libtracker-data => core}/graph/data-3.rq             |   0
 tests/{libtracker-data => core}/graph/data-4.rq             |   0
 tests/{libtracker-data => core}/graph/data-5.rq             |   0
 .../graph/data-add-from-default.rq                          |   0
 .../graph/data-add-from-non-existent.rq                     |   0
 tests/{libtracker-data => core}/graph/data-add-into-self.rq |   0
 .../{libtracker-data => core}/graph/data-add-to-default.rq  |   0
 .../{libtracker-data => core}/graph/data-add-to-existent.rq |   0
 .../graph/data-add-to-non-existent.rq                       |   0
 tests/{libtracker-data => core}/graph/data-add.rq           |   0
 tests/{libtracker-data => core}/graph/data-clear-all.rq     |   0
 tests/{libtracker-data => core}/graph/data-clear-default.rq |   0
 tests/{libtracker-data => core}/graph/data-clear-named.rq   |   0
 .../graph/data-clear-non-existent.rq                        |   0
 tests/{libtracker-data => core}/graph/data-clear.rq         |   0
 .../graph/data-copy-from-default.rq                         |   0
 .../graph/data-copy-from-non-existent.rq                    |   0
 .../{libtracker-data => core}/graph/data-copy-into-self.rq  |   0
 .../{libtracker-data => core}/graph/data-copy-to-default.rq |   0
 .../graph/data-copy-to-existent.rq                          |   0
 .../graph/data-copy-to-non-existent.rq                      |   0
 tests/{libtracker-data => core}/graph/data-copy.rq          |   0
 tests/{libtracker-data => core}/graph/data-drop-all.rq      |   0
 tests/{libtracker-data => core}/graph/data-drop-default.rq  |   0
 tests/{libtracker-data => core}/graph/data-drop-named.rq    |   0
 .../graph/data-drop-non-existent.rq                         |   0
 tests/{libtracker-data => core}/graph/data-drop-silent.rq   |   0
 tests/{libtracker-data => core}/graph/data-drop.rq          |   0
 .../graph/data-move-from-default.rq                         |   0
 .../graph/data-move-from-non-existent.rq                    |   0
 .../{libtracker-data => core}/graph/data-move-into-self.rq  |   0
 .../{libtracker-data => core}/graph/data-move-to-default.rq |   0
 .../graph/data-move-to-existent.rq                          |   0
 tests/{libtracker-data => core}/graph/data-move.rq          |   0
 tests/{libtracker-data => core}/graph/drop-all.out          |   0
 tests/{libtracker-data => core}/graph/drop-all.rq           |   0
 tests/{libtracker-data => core}/graph/drop-default.out      |   0
 tests/{libtracker-data => core}/graph/drop-default.rq       |   0
 tests/{libtracker-data => core}/graph/drop-named.out        |   0
 tests/{libtracker-data => core}/graph/drop-named.rq         |   0
 tests/{libtracker-data => core}/graph/drop-non-existent.out |   0
 tests/{libtracker-data => core}/graph/drop-non-existent.rq  |   0
 tests/{libtracker-data => core}/graph/drop-silent.out       |   0
 tests/{libtracker-data => core}/graph/drop-silent.rq        |   0
 tests/{libtracker-data => core}/graph/drop.out              |   0
 tests/{libtracker-data => core}/graph/drop.rq               |   0
 tests/{libtracker-data => core}/graph/graph-1.out           |   0
 tests/{libtracker-data => core}/graph/graph-1.rq            |   0
 tests/{libtracker-data => core}/graph/graph-2.out           |   0
 tests/{libtracker-data => core}/graph/graph-2.rq            |   0
 tests/{libtracker-data => core}/graph/graph-3.out           |   0
 tests/{libtracker-data => core}/graph/graph-3.rq            |   0
 tests/{libtracker-data => core}/graph/graph-4.out           |   0
 tests/{libtracker-data => core}/graph/graph-4.rq            |   0
 tests/{libtracker-data => core}/graph/graph-5.out           |   0
 tests/{libtracker-data => core}/graph/graph-5.rq            |   0
 tests/{libtracker-data => core}/graph/graph-6.out           |   0
 tests/{libtracker-data => core}/graph/graph-6.rq            |   0
 tests/{libtracker-data => core}/graph/graph-7.out           |   0
 tests/{libtracker-data => core}/graph/graph-7.rq            |   0
 tests/{libtracker-data => core}/graph/graph-unbound-1.out   |   0
 tests/{libtracker-data => core}/graph/graph-unbound-1.rq    |   0
 tests/{libtracker-data => core}/graph/graph-unbound-2.out   |   0
 tests/{libtracker-data => core}/graph/graph-unbound-2.rq    |   0
 tests/{libtracker-data => core}/graph/graph-unbound-3.out   |   0
 tests/{libtracker-data => core}/graph/graph-unbound-3.rq    |   0
 tests/{libtracker-data => core}/graph/move-from-default.out |   0
 tests/{libtracker-data => core}/graph/move-from-default.rq  |   0
 .../graph/move-from-non-existent.out                        |   0
 .../graph/move-from-non-existent.rq                         |   0
 tests/{libtracker-data => core}/graph/move-into-self.out    |   0
 tests/{libtracker-data => core}/graph/move-into-self.rq     |   0
 tests/{libtracker-data => core}/graph/move-to-default.out   |   0
 tests/{libtracker-data => core}/graph/move-to-default.rq    |   0
 tests/{libtracker-data => core}/graph/move-to-existent.out  |   0
 tests/{libtracker-data => core}/graph/move-to-existent.rq   |   0
 tests/{libtracker-data => core}/graph/move.out              |   0
 tests/{libtracker-data => core}/graph/move.rq               |   0
 tests/{libtracker-data => core}/graph/non-existent-1.out    |   0
 tests/{libtracker-data => core}/graph/non-existent-1.rq     |   0
 tests/{libtracker-data => core}/graph/non-existent-2.out    |   0
 tests/{libtracker-data => core}/graph/non-existent-2.rq     |   0
 tests/{libtracker-data => core}/graph/non-existent-3.out    |   0
 tests/{libtracker-data => core}/graph/non-existent-3.rq     |   0
 tests/{libtracker-data => core}/graph/test.ontology         |   0
 tests/{libtracker-data => core}/inline/data.ttl             |   0
 tests/{libtracker-data => core}/inline/inline-1.out         |   0
 tests/{libtracker-data => core}/inline/inline-1.rq          |   0
 tests/{libtracker-data => core}/inline/inline-2.out         |   0
 tests/{libtracker-data => core}/inline/inline-2.rq          |   0
 tests/{libtracker-data => core}/inline/inline-3.out         |   0
 tests/{libtracker-data => core}/inline/inline-3.rq          |   0
 tests/{libtracker-data => core}/inline/inline-4.out         |   0
 tests/{libtracker-data => core}/inline/inline-4.rq          |   0
 tests/{libtracker-data => core}/inline/inline-5.out         |   0
 tests/{libtracker-data => core}/inline/inline-5.rq          |   0
 tests/{libtracker-data => core}/inline/inline-6.out         |   0
 tests/{libtracker-data => core}/inline/inline-6.rq          |   0
 tests/{libtracker-data => core}/inline/inline-7.out         |   0
 tests/{libtracker-data => core}/inline/inline-7.rq          |   0
 tests/{libtracker-data => core}/inline/inline-8.out         |   0
 tests/{libtracker-data => core}/inline/inline-8.rq          |   0
 tests/{libtracker-data => core}/inline/inline-9.out         |   0
 tests/{libtracker-data => core}/inline/inline-9.rq          |   0
 tests/{libtracker-data => core}/inline/test.ontology        |   0
 tests/{libtracker-data => core}/inline/values-1.out         |   0
 tests/{libtracker-data => core}/inline/values-1.rq          |   0
 tests/{libtracker-data => core}/inline/values-2.out         |   0
 tests/{libtracker-data => core}/inline/values-2.rq          |   0
 tests/{libtracker-data => core}/inline/values-3.out         |   0
 tests/{libtracker-data => core}/inline/values-3.rq          |   0
 tests/{libtracker-data => core}/inline/values-4.out         |   0
 tests/{libtracker-data => core}/inline/values-4.rq          |   0
 tests/{libtracker-data => core}/langstring/data.rq          |   0
 tests/{libtracker-data => core}/langstring/langmatches.out  |   0
 tests/{libtracker-data => core}/langstring/langmatches.rq   |   0
 .../langstring/match-non-langstring.out                     |   0
 .../langstring/match-non-langstring.rq                      |   0
 .../langstring/match-with-langstring.out                    |   0
 .../langstring/match-with-langstring.rq                     |   0
 .../langstring/match-with-non-langstring.out                |   0
 .../langstring/match-with-non-langstring.rq                 |   0
 tests/{libtracker-data => core}/langstring/strlang.out      |   0
 tests/{libtracker-data => core}/langstring/strlang.rq       |   0
 tests/{libtracker-data => core}/langstring/test.ontology    |   0
 .../{libtracker-data => core}/lists/data-list-in-object.rq  |   0
 .../{libtracker-data => core}/lists/data-list-in-select.rq  |   0
 .../{libtracker-data => core}/lists/data-list-in-subject.rq |   0
 tests/{libtracker-data => core}/lists/data-list-nested.rq   |   0
 tests/{libtracker-data => core}/lists/list-in-object.out    |   0
 tests/{libtracker-data => core}/lists/list-in-object.rq     |   0
 tests/{libtracker-data => core}/lists/list-in-select.out    |   0
 tests/{libtracker-data => core}/lists/list-in-select.rq     |   0
 tests/{libtracker-data => core}/lists/list-in-subject.out   |   0
 tests/{libtracker-data => core}/lists/list-in-subject.rq    |   0
 tests/{libtracker-data => core}/lists/list-nested.out       |   0
 tests/{libtracker-data => core}/lists/list-nested.rq        |   0
 tests/{libtracker-data => core}/lists/test.ontology         |   0
 tests/{libtracker-data => core}/meson.build                 |   4 ++--
 .../mixed-cardinality/insert-mixed-cardinality-1.rq         |   0
 .../mixed-cardinality/insert-mixed-cardinality-query-1.out  |   0
 .../mixed-cardinality/insert-mixed-cardinality-query-1.rq   |   0
 .../mixed-cardinality/test.ontology                         |   0
 .../mixed-cardinality/update-mixed-cardinality-1.rq         |   0
 .../mixed-cardinality/update-mixed-cardinality-query-1.out  |   0
 .../mixed-cardinality/update-mixed-cardinality-query-1.rq   |   0
 tests/{libtracker-data => core}/nie/data-1.ttl              |   0
 .../{libtracker-data => core}/nie/filter-characterset-1.out |   0
 .../{libtracker-data => core}/nie/filter-characterset-1.rq  |   0
 tests/{libtracker-data => core}/nie/filter-comment-1.out    |   0
 tests/{libtracker-data => core}/nie/filter-comment-1.rq     |   0
 .../{libtracker-data => core}/nie/filter-description-1.out  |   0
 tests/{libtracker-data => core}/nie/filter-description-1.rq |   0
 tests/{libtracker-data => core}/nie/filter-generator-1.out  |   0
 tests/{libtracker-data => core}/nie/filter-generator-1.rq   |   0
 tests/{libtracker-data => core}/nie/filter-identifier-1.out |   0
 tests/{libtracker-data => core}/nie/filter-identifier-1.rq  |   0
 tests/{libtracker-data => core}/nie/filter-keyword-1.out    |   0
 tests/{libtracker-data => core}/nie/filter-keyword-1.rq     |   0
 tests/{libtracker-data => core}/nie/filter-language-1.out   |   0
 tests/{libtracker-data => core}/nie/filter-language-1.rq    |   0
 tests/{libtracker-data => core}/nie/filter-legal-1.out      |   0
 tests/{libtracker-data => core}/nie/filter-legal-1.rq       |   0
 tests/{libtracker-data => core}/nie/filter-mimetype-1.out   |   0
 tests/{libtracker-data => core}/nie/filter-mimetype-1.rq    |   0
 .../nie/filter-plaintextcontent-1.out                       |   0
 .../nie/filter-plaintextcontent-1.rq                        |   0
 tests/{libtracker-data => core}/nie/filter-subject-1.out    |   0
 tests/{libtracker-data => core}/nie/filter-subject-1.rq     |   0
 tests/{libtracker-data => core}/nie/filter-title-1.out      |   0
 tests/{libtracker-data => core}/nie/filter-title-1.rq       |   0
 tests/{libtracker-data => core}/nie/filter-version-1.out    |   0
 tests/{libtracker-data => core}/nie/filter-version-1.rq     |   0
 .../ontology-error/incomplete-property-001.ontology         |   0
 .../ontology-error/incomplete-property-001.out              |   0
 .../ontology-error/parsing-errors-001.errors.out            |   0
 .../ontology-error/parsing-errors-001.ontology              |   0
 .../ontology-error/parsing-errors-001.out                   |   0
 .../ontology-error/unknown-prefix-001.ontology              |   0
 .../ontology-error/unknown-prefix-001.out                   |   0
 .../ontology-error/unknown-prefix-002.ontology              |   0
 .../ontology-error/unknown-prefix-002.out                   |   0
 .../ontology-error/unknown-prefix-003.ontology              |   0
 .../ontology-error/unknown-prefix-003.out                   |   0
 tests/{libtracker-data => core}/optional/complex-data-1.ttl |   0
 .../{libtracker-data => core}/optional/q-opt-complex-1.out  |   0
 tests/{libtracker-data => core}/optional/q-opt-complex-1.rq |   0
 .../optional/simple-optional-triple.out                     |   0
 .../optional/simple-optional-triple.rq                      |   0
 .../optional/simple-optional-triple.ttl                     |   0
 tests/{libtracker-data => core}/optional/test-1.ontology    |   0
 tests/{libtracker-data => core}/optional/test-2.ontology    |   0
 .../property-paths/alternative-path-1.out                   |   0
 .../property-paths/alternative-path-1.rq                    |   0
 .../property-paths/alternative-path-2.out                   |   0
 .../property-paths/alternative-path-2.rq                    |   0
 .../property-paths/alternative-path-3.out                   |   0
 .../property-paths/alternative-path-3.rq                    |   0
 tests/{libtracker-data => core}/property-paths/data-2.ttl   |   0
 tests/{libtracker-data => core}/property-paths/data-3.rq    |   0
 tests/{libtracker-data => core}/property-paths/data.ttl     |   0
 .../property-paths/inverse-path-1.out                       |   0
 .../property-paths/inverse-path-1.rq                        |   0
 .../property-paths/inverse-path-2.out                       |   0
 .../property-paths/inverse-path-2.rq                        |   0
 .../property-paths/mixed-graphs.out                         |   0
 .../property-paths/mixed-graphs.rq                          |   0
 .../property-paths/mixed-inverse-and-sequence-1.out         |   0
 .../property-paths/mixed-inverse-and-sequence-1.rq          |   0
 .../property-paths/mixed-inverse-and-sequence-2.out         |   0
 .../property-paths/mixed-inverse-and-sequence-2.rq          |   0
 .../property-paths/mixed-inverse-and-sequence-3.out         |   0
 .../property-paths/mixed-inverse-and-sequence-3.rq          |   0
 .../property-paths/mixed-optional-and-sequence-1.out        |   0
 .../property-paths/mixed-optional-and-sequence-1.rq         |   0
 .../property-paths/mixed-optional-and-sequence-2.out        |   0
 .../property-paths/mixed-optional-and-sequence-2.rq         |   0
 .../property-paths/mixed-recursive-and-alternative-1.out    |   0
 .../property-paths/mixed-recursive-and-alternative-1.rq     |   0
 .../property-paths/mixed-recursive-and-alternative-2.out    |   0
 .../property-paths/mixed-recursive-and-alternative-2.rq     |   0
 .../property-paths/mixed-recursive-and-inverse-1.out        |   0
 .../property-paths/mixed-recursive-and-inverse-1.rq         |   0
 .../property-paths/mixed-recursive-and-inverse-2.out        |   0
 .../property-paths/mixed-recursive-and-inverse-2.rq         |   0
 .../property-paths/mixed-recursive-and-inverse-3.out        |   0
 .../property-paths/mixed-recursive-and-inverse-3.rq         |   0
 .../property-paths/mixed-recursive-and-sequence-1.out       |   0
 .../property-paths/mixed-recursive-and-sequence-1.rq        |   0
 .../property-paths/mixed-recursive-and-sequence-2.out       |   0
 .../property-paths/mixed-recursive-and-sequence-2.rq        |   0
 .../property-paths/mixed-recursive-and-sequence-3.out       |   0
 .../property-paths/mixed-recursive-and-sequence-3.rq        |   0
 .../property-paths/mixed-recursive-and-sequence-4.out       |   0
 .../property-paths/mixed-recursive-and-sequence-4.rq        |   0
 .../property-paths/mixed-recursive-and-sequence-5.out       |   0
 .../property-paths/mixed-recursive-and-sequence-5.rq        |   0
 .../property-paths/negated-path-1.out                       |   0
 .../property-paths/negated-path-1.rq                        |   0
 .../property-paths/negated-path-10.out                      |   0
 .../property-paths/negated-path-10.rq                       |   0
 .../property-paths/negated-path-11.out                      |   0
 .../property-paths/negated-path-11.rq                       |   0
 .../property-paths/negated-path-2.out                       |   0
 .../property-paths/negated-path-2.rq                        |   0
 .../property-paths/negated-path-3.out                       |   0
 .../property-paths/negated-path-3.rq                        |   0
 .../property-paths/negated-path-4.out                       |   0
 .../property-paths/negated-path-4.rq                        |   0
 .../property-paths/negated-path-5.out                       |   0
 .../property-paths/negated-path-5.rq                        |   0
 .../property-paths/negated-path-6.out                       |   0
 .../property-paths/negated-path-6.rq                        |   0
 .../property-paths/negated-path-7.out                       |   0
 .../property-paths/negated-path-7.rq                        |   0
 .../property-paths/negated-path-8.out                       |   0
 .../property-paths/negated-path-8.rq                        |   0
 .../property-paths/negated-path-9.out                       |   0
 .../property-paths/negated-path-9.rq                        |   0
 .../property-paths/optional-path-1.out                      |   0
 .../property-paths/optional-path-1.rq                       |   0
 .../property-paths/optional-path-2.out                      |   0
 .../property-paths/optional-path-2.rq                       |   0
 tests/{libtracker-data => core}/property-paths/query-1.rq   |   0
 .../property-paths/recursive-path-1.out                     |   0
 .../property-paths/recursive-path-1.rq                      |   0
 .../property-paths/recursive-path-2.out                     |   0
 .../property-paths/recursive-path-2.rq                      |   0
 .../property-paths/recursive-path-3.out                     |   0
 .../property-paths/recursive-path-3.rq                      |   0
 .../property-paths/sequence-path-1.out                      |   0
 .../property-paths/sequence-path-1.rq                       |   0
 .../property-paths/sequence-path-2.out                      |   0
 .../property-paths/sequence-path-2.rq                       |   0
 .../property-paths/sequence-path-3.out                      |   0
 .../property-paths/sequence-path-3.rq                       |   0
 .../{libtracker-data => core}/property-paths/test.ontology  |   0
 tests/{libtracker-data => core}/regex/regex-data-01.ttl     |   0
 .../regex/regex-query-001.extra.out                         |   0
 .../regex/regex-query-001.extra.rq                          |   0
 tests/{libtracker-data => core}/regex/regex-query-001.out   |   0
 tests/{libtracker-data => core}/regex/regex-query-001.rq    |   0
 tests/{libtracker-data => core}/regex/regex-query-002.out   |   0
 tests/{libtracker-data => core}/regex/regex-query-002.rq    |   0
 tests/{libtracker-data => core}/regex/test.ontology         |   0
 tests/{libtracker-data => core}/run-test-in-tmp-dir.sh      |   0
 .../service/service-after-triples-1.out                     |   0
 .../service/service-after-triples-1.rq                      |   0
 .../service/service-before-triples-1.out                    |   0
 .../service/service-before-triples-1.rq                     |   0
 tests/{libtracker-data => core}/service/service-empty-1.out |   0
 tests/{libtracker-data => core}/service/service-empty-1.rq  |   0
 tests/{libtracker-data => core}/service/service-empty-2.out |   0
 tests/{libtracker-data => core}/service/service-empty-2.rq  |   0
 .../service/service-local-filter-1.out                      |   0
 .../service/service-local-filter-1.rq                       |   0
 tests/{libtracker-data => core}/service/service-query-1.out |   0
 tests/{libtracker-data => core}/service/service-query-1.rq  |   0
 .../service/service-union-with-local-1.out                  |   0
 .../service/service-union-with-local-1.rq                   |   0
 .../service/service-union-with-local-2.out                  |   0
 .../service/service-union-with-local-2.rq                   |   0
 .../service/service-union-with-local-3.out                  |   0
 .../service/service-union-with-local-3.rq                   |   0
 tests/{libtracker-data => core}/service/service-var-1.out   |   0
 tests/{libtracker-data => core}/service/service-var-1.rq    |   0
 tests/{libtracker-data => core}/service/service-var-2.out   |   0
 tests/{libtracker-data => core}/service/service-var-2.rq    |   0
 tests/{libtracker-data => core}/sort/data-sort-1.ttl        |   0
 tests/{libtracker-data => core}/sort/data-sort-3.ttl        |   0
 tests/{libtracker-data => core}/sort/data-sort-4.ttl        |   0
 tests/{libtracker-data => core}/sort/data-sort-5.ttl        |   0
 tests/{libtracker-data => core}/sort/data-title-sort-1.ttl  |   0
 tests/{libtracker-data => core}/sort/query-sort-1.out       |   0
 tests/{libtracker-data => core}/sort/query-sort-1.rq        |   0
 tests/{libtracker-data => core}/sort/query-sort-2.out       |   0
 tests/{libtracker-data => core}/sort/query-sort-2.rq        |   0
 tests/{libtracker-data => core}/sort/query-sort-3.out       |   0
 tests/{libtracker-data => core}/sort/query-sort-3.rq        |   0
 tests/{libtracker-data => core}/sort/query-sort-4.out       |   0
 tests/{libtracker-data => core}/sort/query-sort-4.rq        |   0
 tests/{libtracker-data => core}/sort/query-sort-5.out       |   0
 tests/{libtracker-data => core}/sort/query-sort-5.rq        |   0
 tests/{libtracker-data => core}/sort/query-sort-6.out       |   0
 tests/{libtracker-data => core}/sort/query-sort-6.rq        |   0
 tests/{libtracker-data => core}/sort/query-sort-7.out       |   0
 tests/{libtracker-data => core}/sort/query-sort-7.rq        |   0
 tests/{libtracker-data => core}/sort/query-sort-8.out       |   0
 tests/{libtracker-data => core}/sort/query-sort-8.rq        |   0
 tests/{libtracker-data => core}/sort/query-sort-9.out       |   0
 tests/{libtracker-data => core}/sort/query-sort-9.rq        |   0
 tests/{libtracker-data => core}/sort/query-title-sort-1.out |   0
 tests/{libtracker-data => core}/sort/query-title-sort-1.rq  |   0
 tests/{libtracker-data => core}/sort/test.ontology          |   0
 tests/{libtracker-data => core}/subqueries/data-1.ttl       |   0
 tests/{libtracker-data => core}/subqueries/subqueries-1.out |   0
 tests/{libtracker-data => core}/subqueries/subqueries-1.rq  |   0
 .../subqueries/subqueries-minus-1.out                       |   0
 .../subqueries/subqueries-minus-1.rq                        |   0
 .../subqueries/subqueries-minus-2.out                       |   0
 .../subqueries/subqueries-minus-2.rq                        |   0
 .../subqueries/subqueries-minus-3.out                       |   0
 .../subqueries/subqueries-minus-3.rq                        |   0
 .../subqueries/subqueries-minus-4.out                       |   0
 .../subqueries/subqueries-minus-4.rq                        |   0
 .../subqueries/subqueries-minus-5.out                       |   0
 .../subqueries/subqueries-minus-5.rq                        |   0
 .../subqueries/subqueries-union-1.out                       |   0
 .../subqueries/subqueries-union-1.rq                        |   0
 .../subqueries/subqueries-union-2.out                       |   0
 .../subqueries/subqueries-union-2.rq                        |   0
 .../subqueries/subqueries-union-3.out                       |   0
 .../subqueries/subqueries-union-3.rq                        |   0
 .../subqueries/subqueries-union-4.out                       |   0
 .../subqueries/subqueries-union-4.rq                        |   0
 tests/{libtracker-data => core}/subqueries/test.ontology    |   0
 .../tracker-insert-or-replace-test.c                        |   2 +-
 .../tracker-ontology-change-test.c                          |   6 +++---
 .../{libtracker-data => core}/tracker-ontology-error-test.c |   6 +++---
 tests/{libtracker-data => core}/tracker-ontology-test.c     |   6 +++---
 tests/{libtracker-data => core}/tracker-service-test.c      |   6 +++---
 tests/{libtracker-data => core}/tracker-sparql-blank-test.c |   2 +-
 tests/{libtracker-data => core}/tracker-sparql-test.c       |   6 +++---
 .../{libtracker-data => core}/turtle-comments/test.ontology |   0
 .../turtle-comments/turtle-data-001.ttl                     |   0
 .../turtle-comments/turtle-query-001.out                    |   0
 .../turtle-comments/turtle-query-001.rq                     |   0
 tests/{libtracker-data => core}/turtle/test.ontology        |   0
 tests/{libtracker-data => core}/turtle/turtle-data-001.ttl  |   0
 tests/{libtracker-data => core}/turtle/turtle-data-002.ttl  |   0
 tests/{libtracker-data => core}/turtle/turtle-query-001.out |   0
 tests/{libtracker-data => core}/turtle/turtle-query-001.rq  |   0
 tests/{libtracker-data => core}/turtle/turtle-query-002.out |   0
 tests/{libtracker-data => core}/turtle/turtle-query-002.rq  |   0
 tests/{libtracker-data => core}/unbound/data.ontology       |   0
 tests/{libtracker-data => core}/unbound/data.ttl            |   0
 tests/{libtracker-data => core}/unbound/unbound-1.out       |   0
 tests/{libtracker-data => core}/unbound/unbound-1.rq        |   0
 tests/{libtracker-data => core}/unbound/unbound-2.out       |   0
 tests/{libtracker-data => core}/unbound/unbound-2.rq        |   0
 tests/{libtracker-data => core}/unbound/unbound-3.out       |   0
 tests/{libtracker-data => core}/unbound/unbound-3.rq        |   0
 tests/{libtracker-data => core}/unbound/unbound-4.out       |   0
 tests/{libtracker-data => core}/unbound/unbound-4.rq        |   0
 tests/{libtracker-data => core}/unbound/unbound-5.out       |   0
 tests/{libtracker-data => core}/unbound/unbound-5.rq        |   0
 tests/{libtracker-data => core}/update/delete-data-1.rq     |   0
 tests/{libtracker-data => core}/update/delete-data-2.rq     |   0
 .../update/delete-data-query-1.out                          |   0
 .../{libtracker-data => core}/update/delete-data-query-1.rq |   0
 .../update/delete-data-query-2.out                          |   0
 .../{libtracker-data => core}/update/delete-data-query-2.rq |   0
 .../update/delete-insert-where-1.rq                         |   0
 .../update/delete-insert-where-2.rq                         |   0
 .../update/delete-insert-where-3.rq                         |   0
 .../update/delete-insert-where-4.rq                         |   0
 .../update/delete-insert-where-5.rq                         |   0
 .../update/delete-insert-where-6.rq                         |   0
 .../update/delete-insert-where-query-1.out                  |   0
 .../update/delete-insert-where-query-1.rq                   |   0
 .../update/delete-insert-where-query-2.out                  |   0
 .../update/delete-insert-where-query-2.rq                   |   0
 .../update/delete-insert-where-query-3.out                  |   0
 .../update/delete-insert-where-query-3.rq                   |   0
 .../update/delete-insert-where-query-4.out                  |   0
 .../update/delete-insert-where-query-4.rq                   |   0
 .../update/delete-insert-where-query-5.out                  |   0
 .../update/delete-insert-where-query-5.rq                   |   0
 .../update/delete-insert-where-query-6.out                  |   0
 .../update/delete-insert-where-query-6.rq                   |   0
 tests/{libtracker-data => core}/update/delete-where-1.rq    |   0
 tests/{libtracker-data => core}/update/delete-where-2.rq    |   0
 tests/{libtracker-data => core}/update/delete-where-3.rq    |   0
 .../update/delete-where-query-1.out                         |   0
 .../update/delete-where-query-1.rq                          |   0
 .../update/delete-where-query-2.out                         |   0
 .../update/delete-where-query-2.rq                          |   0
 .../update/delete-where-query-3.out                         |   0
 .../update/delete-where-query-3.rq                          |   0
 tests/{libtracker-data => core}/update/insert-data-1.rq     |   0
 tests/{libtracker-data => core}/update/insert-data-2.rq     |   0
 .../update/insert-data-query-1.out                          |   0
 .../{libtracker-data => core}/update/insert-data-query-1.rq |   0
 .../update/insert-data-query-2.out                          |   0
 .../{libtracker-data => core}/update/insert-data-query-2.rq |   0
 .../update/insert-date-with-offset-1.rq                     |   0
 .../update/invalid-insert-where-1.rq                        |   0
 .../update/invalid-insert-where-query-1.out                 |   0
 .../update/invalid-insert-where-query-1.rq                  |   0
 .../update/select-date-with-offset-1.out                    |   0
 .../update/select-date-with-offset-1.rq                     |   0
 tests/{libtracker-data => core}/update/test.ontology        |   0
 tests/meson.build                                           |   2 +-
 924 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/tests/libtracker-data/.gitignore b/tests/core/.gitignore
similarity index 100%
rename from tests/libtracker-data/.gitignore
rename to tests/core/.gitignore
diff --git a/tests/libtracker-data/aggregates/aggregate-1.out b/tests/core/aggregates/aggregate-1.out
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-1.out
rename to tests/core/aggregates/aggregate-1.out
diff --git a/tests/libtracker-data/aggregates/aggregate-1.rq b/tests/core/aggregates/aggregate-1.rq
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-count-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-count-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-count-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-count-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-count-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-count-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-distinct-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-distinct-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-as-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-as-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-having-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-group-having-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-sample-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-sample-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-sample-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/aggregates/aggregate-sample-2.rq
rename to tests/core/aggregates/aggregate-sample-2.rq
diff --git a/tests/libtracker-data/aggregates/data-1.ttl b/tests/core/aggregates/data-1.ttl
similarity index 100%
rename from tests/libtracker-data/aggregates/data-1.ttl
rename to tests/core/aggregates/data-1.ttl
diff --git a/tests/libtracker-data/aggregates/test.ontology b/tests/core/aggregates/test.ontology
similarity index 100%
rename from tests/libtracker-data/aggregates/test.ontology
rename to tests/core/aggregates/test.ontology
diff --git a/tests/libtracker-data/algebra/data-1.ttl b/tests/core/algebra/data-1.ttl
similarity index 100%
rename from tests/libtracker-data/algebra/data-1.ttl
rename to tests/core/algebra/data-1.ttl
diff --git a/tests/libtracker-data/algebra/data-2.ttl b/tests/core/algebra/data-2.ttl
similarity index 100%
rename from tests/libtracker-data/algebra/data-2.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-in-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-nested-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-nested-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-nested-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-nested-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-placement-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-placement-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-placement-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-placement-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-placement-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-placement-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-placement-3a.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-placement-3a.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-scope-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/filter-scope-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/modifier-limit-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/modifier-limit-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/modifier-limit-offset-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/modifier-limit-offset-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/modifier-limit-offset-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/modifier-limit-offset-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/modifier-offset-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/modifier-offset-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/opt-filter-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/opt-filter-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/opt-filter-3.ttl
rename to tests/core/algebra/opt-filter-3.ttl
diff --git a/tests/libtracker-data/algebra/test-1.ontology b/tests/core/algebra/test-1.ontology
similarity index 100%
rename from tests/libtracker-data/algebra/test-1.ontology
rename to tests/core/algebra/test-1.ontology
diff --git a/tests/libtracker-data/algebra/test-2.ontology b/tests/core/algebra/test-2.ontology
similarity index 100%
rename from tests/libtracker-data/algebra/test-2.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/two-nested-opt-alt.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/two-nested-opt-alt.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/two-nested-opt.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/two-nested-opt.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/two-nested-opt.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/var-scope-join-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/var-scope-join-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/algebra/var-scope-join-1.ttl
rename to tests/core/algebra/var-scope-join-1.ttl
diff --git a/tests/libtracker-data/anon/data.ttl b/tests/core/anon/data.ttl
similarity index 100%
rename from tests/libtracker-data/anon/data.ttl
rename to tests/core/anon/data.ttl
diff --git a/tests/libtracker-data/anon/query-2.out b/tests/core/anon/query-2.out
similarity index 100%
rename from tests/libtracker-data/anon/query-2.out
rename to tests/core/anon/query-2.out
diff --git a/tests/libtracker-data/anon/query-2.rq b/tests/core/anon/query-2.rq
similarity index 100%
rename from tests/libtracker-data/anon/query-2.rq
rename to tests/core/anon/query-2.rq
diff --git a/tests/libtracker-data/anon/query-3.out b/tests/core/anon/query-3.out
similarity index 100%
rename from tests/libtracker-data/anon/query-3.out
rename to tests/core/anon/query-3.out
diff --git a/tests/libtracker-data/anon/query-3.rq b/tests/core/anon/query-3.rq
similarity index 100%
rename from tests/libtracker-data/anon/query-3.rq
rename to tests/core/anon/query-3.rq
diff --git a/tests/libtracker-data/anon/query-4.out b/tests/core/anon/query-4.out
similarity index 100%
rename from tests/libtracker-data/anon/query-4.out
rename to tests/core/anon/query-4.out
diff --git a/tests/libtracker-data/anon/query-4.rq b/tests/core/anon/query-4.rq
similarity index 100%
rename from tests/libtracker-data/anon/query-4.rq
rename to tests/core/anon/query-4.rq
diff --git a/tests/libtracker-data/anon/query-5.out b/tests/core/anon/query-5.out
similarity index 100%
rename from tests/libtracker-data/anon/query-5.out
rename to tests/core/anon/query-5.out
diff --git a/tests/libtracker-data/anon/query-5.rq b/tests/core/anon/query-5.rq
similarity index 100%
rename from tests/libtracker-data/anon/query-5.rq
rename to tests/core/anon/query-5.rq
diff --git a/tests/libtracker-data/anon/query.out b/tests/core/anon/query.out
similarity index 100%
rename from tests/libtracker-data/anon/query.out
rename to tests/core/anon/query.out
diff --git a/tests/libtracker-data/anon/query.rq b/tests/core/anon/query.rq
similarity index 100%
rename from tests/libtracker-data/anon/query.rq
rename to tests/core/anon/query.rq
diff --git a/tests/libtracker-data/anon/test.ontology b/tests/core/anon/test.ontology
similarity index 100%
rename from tests/libtracker-data/anon/test.ontology
rename to tests/core/anon/test.ontology
diff --git a/tests/libtracker-data/ask/ask-1.out b/tests/core/ask/ask-1.out
similarity index 100%
rename from tests/libtracker-data/ask/ask-1.out
rename to tests/core/ask/ask-1.out
diff --git a/tests/libtracker-data/ask/ask-1.rq b/tests/core/ask/ask-1.rq
similarity index 100%
rename from tests/libtracker-data/ask/ask-1.rq
rename to tests/core/ask/ask-1.rq
diff --git a/tests/libtracker-data/ask/data.ontology b/tests/core/ask/data.ontology
similarity index 100%
rename from tests/libtracker-data/ask/data.ontology
rename to tests/core/ask/data.ontology
diff --git a/tests/libtracker-data/ask/data.ttl b/tests/core/ask/data.ttl
similarity index 100%
rename from tests/libtracker-data/ask/data.ttl
rename to tests/core/ask/data.ttl
diff --git a/tests/libtracker-data/basic/base-1.out b/tests/core/basic/base-1.out
similarity index 100%
rename from tests/libtracker-data/basic/base-1.out
rename to tests/core/basic/base-1.out
diff --git a/tests/libtracker-data/basic/base-1.rq b/tests/core/basic/base-1.rq
similarity index 100%
rename from tests/libtracker-data/basic/base-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/basic/base-prefix-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/basic/base-prefix-3.rq
rename to tests/core/basic/base-prefix-3.rq
diff --git a/tests/libtracker-data/basic/codepoint-escaping.out b/tests/core/basic/codepoint-escaping.out
similarity index 100%
rename from tests/libtracker-data/basic/codepoint-escaping.out
rename to tests/core/basic/codepoint-escaping.out
diff --git a/tests/libtracker-data/basic/codepoint-escaping.rq b/tests/core/basic/codepoint-escaping.rq
similarity index 100%
rename from tests/libtracker-data/basic/codepoint-escaping.rq
rename to tests/core/basic/codepoint-escaping.rq
diff --git a/tests/libtracker-data/basic/compare-cast.out b/tests/core/basic/compare-cast.out
similarity index 100%
rename from tests/libtracker-data/basic/compare-cast.out
rename to tests/core/basic/compare-cast.out
diff --git a/tests/libtracker-data/basic/compare-cast.rq b/tests/core/basic/compare-cast.rq
similarity index 100%
rename from tests/libtracker-data/basic/compare-cast.rq
rename to tests/core/basic/compare-cast.rq
diff --git a/tests/libtracker-data/basic/data-1.ttl b/tests/core/basic/data-1.ttl
similarity index 100%
rename from tests/libtracker-data/basic/data-1.ttl
rename to tests/core/basic/data-1.ttl
diff --git a/tests/libtracker-data/basic/long-strings.out b/tests/core/basic/long-strings.out
similarity index 100%
rename from tests/libtracker-data/basic/long-strings.out
rename to tests/core/basic/long-strings.out
diff --git a/tests/libtracker-data/basic/long-strings.rq b/tests/core/basic/long-strings.rq
similarity index 100%
rename from tests/libtracker-data/basic/long-strings.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/basic/predicate-variable-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/basic/predicate-variable-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/basic/predicate-variable-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/basic/predicate-variable-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/basic/predicate-variable-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/basic/predicate-variable-4.rq
rename to tests/core/basic/predicate-variable-4.rq
diff --git a/tests/libtracker-data/basic/predicate-variable.out b/tests/core/basic/predicate-variable.out
similarity index 100%
rename from tests/libtracker-data/basic/predicate-variable.out
rename to tests/core/basic/predicate-variable.out
diff --git a/tests/libtracker-data/basic/predicate-variable.rq b/tests/core/basic/predicate-variable.rq
similarity index 100%
rename from tests/libtracker-data/basic/predicate-variable.rq
rename to tests/core/basic/predicate-variable.rq
diff --git a/tests/libtracker-data/basic/test.ontology b/tests/core/basic/test.ontology
similarity index 100%
rename from tests/libtracker-data/basic/test.ontology
rename to tests/core/basic/test.ontology
diff --git a/tests/libtracker-data/basic/urn-in-as.out b/tests/core/basic/urn-in-as.out
similarity index 100%
rename from tests/libtracker-data/basic/urn-in-as.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/basic/urn-in-as.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/bind/bind-reused-different-patterns.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/bind/bind-reused-different-patterns.rq
rename to tests/core/bind/bind-reused-different-patterns.rq
diff --git a/tests/libtracker-data/bind/bind1.out b/tests/core/bind/bind1.out
similarity index 100%
rename from tests/libtracker-data/bind/bind1.out
rename to tests/core/bind/bind1.out
diff --git a/tests/libtracker-data/bind/bind1.rq b/tests/core/bind/bind1.rq
similarity index 100%
rename from tests/libtracker-data/bind/bind1.rq
rename to tests/core/bind/bind1.rq
diff --git a/tests/libtracker-data/bind/bind2.out b/tests/core/bind/bind2.out
similarity index 100%
rename from tests/libtracker-data/bind/bind2.out
rename to tests/core/bind/bind2.out
diff --git a/tests/libtracker-data/bind/bind2.rq b/tests/core/bind/bind2.rq
similarity index 100%
rename from tests/libtracker-data/bind/bind2.rq
rename to tests/core/bind/bind2.rq
diff --git a/tests/libtracker-data/bind/bind3.out b/tests/core/bind/bind3.out
similarity index 100%
rename from tests/libtracker-data/bind/bind3.out
rename to tests/core/bind/bind3.out
diff --git a/tests/libtracker-data/bind/bind3.rq b/tests/core/bind/bind3.rq
similarity index 100%
rename from tests/libtracker-data/bind/bind3.rq
rename to tests/core/bind/bind3.rq
diff --git a/tests/libtracker-data/bind/bind4.out b/tests/core/bind/bind4.out
similarity index 100%
rename from tests/libtracker-data/bind/bind4.out
rename to tests/core/bind/bind4.out
diff --git a/tests/libtracker-data/bind/bind4.rq b/tests/core/bind/bind4.rq
similarity index 100%
rename from tests/libtracker-data/bind/bind4.rq
rename to tests/core/bind/bind4.rq
diff --git a/tests/libtracker-data/bind/bind5.out b/tests/core/bind/bind5.out
similarity index 100%
rename from tests/libtracker-data/bind/bind5.out
rename to tests/core/bind/bind5.out
diff --git a/tests/libtracker-data/bind/bind5.rq b/tests/core/bind/bind5.rq
similarity index 100%
rename from tests/libtracker-data/bind/bind5.rq
rename to tests/core/bind/bind5.rq
diff --git a/tests/libtracker-data/bind/bind6.out b/tests/core/bind/bind6.out
similarity index 100%
rename from tests/libtracker-data/bind/bind6.out
rename to tests/core/bind/bind6.out
diff --git a/tests/libtracker-data/bind/bind6.rq b/tests/core/bind/bind6.rq
similarity index 100%
rename from tests/libtracker-data/bind/bind6.rq
rename to tests/core/bind/bind6.rq
diff --git a/tests/libtracker-data/bind/bind7.out b/tests/core/bind/bind7.out
similarity index 100%
rename from tests/libtracker-data/bind/bind7.out
rename to tests/core/bind/bind7.out
diff --git a/tests/libtracker-data/bind/bind7.rq b/tests/core/bind/bind7.rq
similarity index 100%
rename from tests/libtracker-data/bind/bind7.rq
rename to tests/core/bind/bind7.rq
diff --git a/tests/libtracker-data/bind/data.ontology b/tests/core/bind/data.ontology
similarity index 100%
rename from tests/libtracker-data/bind/data.ontology
rename to tests/core/bind/data.ontology
diff --git a/tests/libtracker-data/bind/data.ttl b/tests/core/bind/data.ttl
similarity index 100%
rename from tests/libtracker-data/bind/data.ttl
rename to tests/core/bind/data.ttl
diff --git a/tests/libtracker-data/bnode-coreference/data.ontology 
b/tests/core/bnode-coreference/data.ontology
similarity index 100%
rename from tests/libtracker-data/bnode-coreference/data.ontology
rename to tests/core/bnode-coreference/data.ontology
diff --git a/tests/libtracker-data/bnode-coreference/data.ttl b/tests/core/bnode-coreference/data.ttl
similarity index 100%
rename from tests/libtracker-data/bnode-coreference/data.ttl
rename to tests/core/bnode-coreference/data.ttl
diff --git a/tests/libtracker-data/bnode-coreference/query.out b/tests/core/bnode-coreference/query.out
similarity index 100%
rename from tests/libtracker-data/bnode-coreference/query.out
rename to tests/core/bnode-coreference/query.out
diff --git a/tests/libtracker-data/bnode-coreference/query.rq b/tests/core/bnode-coreference/query.rq
similarity index 100%
rename from tests/libtracker-data/bnode-coreference/query.rq
rename to tests/core/bnode-coreference/query.rq
diff --git a/tests/libtracker-data/bnode/data.ontology b/tests/core/bnode/data.ontology
similarity index 100%
rename from tests/libtracker-data/bnode/data.ontology
rename to tests/core/bnode/data.ontology
diff --git a/tests/libtracker-data/bnode/data.ttl b/tests/core/bnode/data.ttl
similarity index 100%
rename from tests/libtracker-data/bnode/data.ttl
rename to tests/core/bnode/data.ttl
diff --git a/tests/libtracker-data/bnode/query-1.out b/tests/core/bnode/query-1.out
similarity index 100%
rename from tests/libtracker-data/bnode/query-1.out
rename to tests/core/bnode/query-1.out
diff --git a/tests/libtracker-data/bnode/query-1.rq b/tests/core/bnode/query-1.rq
similarity index 100%
rename from tests/libtracker-data/bnode/query-1.rq
rename to tests/core/bnode/query-1.rq
diff --git a/tests/libtracker-data/bnode/query-2.out b/tests/core/bnode/query-2.out
similarity index 100%
rename from tests/libtracker-data/bnode/query-2.out
rename to tests/core/bnode/query-2.out
diff --git a/tests/libtracker-data/bnode/query-2.rq b/tests/core/bnode/query-2.rq
similarity index 100%
rename from tests/libtracker-data/bnode/query-2.rq
rename to tests/core/bnode/query-2.rq
diff --git a/tests/libtracker-data/bnode/query-3.out b/tests/core/bnode/query-3.out
similarity index 100%
rename from tests/libtracker-data/bnode/query-3.out
rename to tests/core/bnode/query-3.out
diff --git a/tests/libtracker-data/bnode/query-3.rq b/tests/core/bnode/query-3.rq
similarity index 100%
rename from tests/libtracker-data/bnode/query-3.rq
rename to tests/core/bnode/query-3.rq
diff --git a/tests/libtracker-data/bnode/query-4.out b/tests/core/bnode/query-4.out
similarity index 100%
rename from tests/libtracker-data/bnode/query-4.out
rename to tests/core/bnode/query-4.out
diff --git a/tests/libtracker-data/bnode/query-4.rq b/tests/core/bnode/query-4.rq
similarity index 100%
rename from tests/libtracker-data/bnode/query-4.rq
rename to tests/core/bnode/query-4.rq
diff --git a/tests/libtracker-data/bnode/query-5.out b/tests/core/bnode/query-5.out
similarity index 100%
rename from tests/libtracker-data/bnode/query-5.out
rename to tests/core/bnode/query-5.out
diff --git a/tests/libtracker-data/bnode/query-5.rq b/tests/core/bnode/query-5.rq
similarity index 100%
rename from tests/libtracker-data/bnode/query-5.rq
rename to tests/core/bnode/query-5.rq
diff --git a/tests/libtracker-data/bound/bound1.out b/tests/core/bound/bound1.out
similarity index 100%
rename from tests/libtracker-data/bound/bound1.out
rename to tests/core/bound/bound1.out
diff --git a/tests/libtracker-data/bound/bound1.rq b/tests/core/bound/bound1.rq
similarity index 100%
rename from tests/libtracker-data/bound/bound1.rq
rename to tests/core/bound/bound1.rq
diff --git a/tests/libtracker-data/bound/data.ontology b/tests/core/bound/data.ontology
similarity index 100%
rename from tests/libtracker-data/bound/data.ontology
rename to tests/core/bound/data.ontology
diff --git a/tests/libtracker-data/bound/data.ttl b/tests/core/bound/data.ttl
similarity index 100%
rename from tests/libtracker-data/bound/data.ttl
rename to tests/core/bound/data.ttl
diff --git a/tests/libtracker-data/change/change-test-1.out b/tests/core/change/change-test-1.out
similarity index 100%
rename from tests/libtracker-data/change/change-test-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-6.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/change-test-6.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v1
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v10
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v11
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v12
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v13
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v2
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v3
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v4
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v5
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v6
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v7
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v8
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/source/99-example.ontology.v9
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/test-1.out
rename to tests/core/change/test-1.out
diff --git a/tests/libtracker-data/change/test-1.rq b/tests/core/change/test-1.rq
similarity index 100%
rename from tests/libtracker-data/change/test-1.rq
rename to tests/core/change/test-1.rq
diff --git a/tests/libtracker-data/change/test-2.out b/tests/core/change/test-2.out
similarity index 100%
rename from tests/libtracker-data/change/test-2.out
rename to tests/core/change/test-2.out
diff --git a/tests/libtracker-data/change/test-2.rq b/tests/core/change/test-2.rq
similarity index 100%
rename from tests/libtracker-data/change/test-2.rq
rename to tests/core/change/test-2.rq
diff --git a/tests/libtracker-data/change/test-3.out b/tests/core/change/test-3.out
similarity index 100%
rename from tests/libtracker-data/change/test-3.out
rename to tests/core/change/test-3.out
diff --git a/tests/libtracker-data/change/test-3.rq b/tests/core/change/test-3.rq
similarity index 100%
rename from tests/libtracker-data/change/test-3.rq
rename to tests/core/change/test-3.rq
diff --git a/tests/libtracker-data/change/test-4.out b/tests/core/change/test-4.out
similarity index 100%
rename from tests/libtracker-data/change/test-4.out
rename to tests/core/change/test-4.out
diff --git a/tests/libtracker-data/change/test-4.rq b/tests/core/change/test-4.rq
similarity index 100%
rename from tests/libtracker-data/change/test-4.rq
rename to tests/core/change/test-4.rq
diff --git a/tests/libtracker-data/change/test-5.out b/tests/core/change/test-5.out
similarity index 100%
rename from tests/libtracker-data/change/test-5.out
rename to tests/core/change/test-5.out
diff --git a/tests/libtracker-data/change/test-5.rq b/tests/core/change/test-5.rq
similarity index 100%
rename from tests/libtracker-data/change/test-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v10
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v11
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v2
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v3
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v4
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v5
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v6
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v7
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v8
rename to 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
similarity index 100%
rename from tests/libtracker-data/change/updates/99-example.queries.v9
rename to 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
similarity index 100%
rename from tests/libtracker-data/constraint/coexisting-1.out
rename to tests/core/constraint/coexisting-1.out
diff --git a/tests/libtracker-data/constraint/coexisting-1.rq b/tests/core/constraint/coexisting-1.rq
similarity index 100%
rename from tests/libtracker-data/constraint/coexisting-1.rq
rename to tests/core/constraint/coexisting-1.rq
diff --git a/tests/libtracker-data/constraint/coexisting-2.out b/tests/core/constraint/coexisting-2.out
similarity index 100%
rename from tests/libtracker-data/constraint/coexisting-2.out
rename to tests/core/constraint/coexisting-2.out
diff --git a/tests/libtracker-data/constraint/coexisting-2.rq b/tests/core/constraint/coexisting-2.rq
similarity index 100%
rename from tests/libtracker-data/constraint/coexisting-2.rq
rename to tests/core/constraint/coexisting-2.rq
diff --git a/tests/libtracker-data/constraint/coexisting-3.out b/tests/core/constraint/coexisting-3.out
similarity index 100%
rename from tests/libtracker-data/constraint/coexisting-3.out
rename to tests/core/constraint/coexisting-3.out
diff --git a/tests/libtracker-data/constraint/coexisting-3.rq b/tests/core/constraint/coexisting-3.rq
similarity index 100%
rename from tests/libtracker-data/constraint/coexisting-3.rq
rename to tests/core/constraint/coexisting-3.rq
diff --git a/tests/libtracker-data/constraint/coexisting-4.out b/tests/core/constraint/coexisting-4.out
similarity index 100%
rename from tests/libtracker-data/constraint/coexisting-4.out
rename to tests/core/constraint/coexisting-4.out
diff --git a/tests/libtracker-data/constraint/coexisting-4.rq b/tests/core/constraint/coexisting-4.rq
similarity index 100%
rename from tests/libtracker-data/constraint/coexisting-4.rq
rename to tests/core/constraint/coexisting-4.rq
diff --git a/tests/libtracker-data/constraint/data.rq b/tests/core/constraint/data.rq
similarity index 100%
rename from tests/libtracker-data/constraint/data.rq
rename to tests/core/constraint/data.rq
diff --git a/tests/libtracker-data/constraint/empty-graph-1.out b/tests/core/constraint/empty-graph-1.out
similarity index 100%
rename from tests/libtracker-data/constraint/empty-graph-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/constraint/empty-graph-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/constraint/empty-graph-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/constraint/empty-graph-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/constraint/empty-graph-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/constraint/empty-graph-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/constraint/empty-graph-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/constraint/empty-graph-4.rq
rename to tests/core/constraint/empty-graph-4.rq
diff --git a/tests/libtracker-data/constraint/nested-1.out b/tests/core/constraint/nested-1.out
similarity index 100%
rename from tests/libtracker-data/constraint/nested-1.out
rename to tests/core/constraint/nested-1.out
diff --git a/tests/libtracker-data/constraint/nested-1.rq b/tests/core/constraint/nested-1.rq
similarity index 100%
rename from tests/libtracker-data/constraint/nested-1.rq
rename to tests/core/constraint/nested-1.rq
diff --git a/tests/libtracker-data/constraint/nested-2.out b/tests/core/constraint/nested-2.out
similarity index 100%
rename from tests/libtracker-data/constraint/nested-2.out
rename to tests/core/constraint/nested-2.out
diff --git a/tests/libtracker-data/constraint/nested-2.rq b/tests/core/constraint/nested-2.rq
similarity index 100%
rename from tests/libtracker-data/constraint/nested-2.rq
rename to tests/core/constraint/nested-2.rq
diff --git a/tests/libtracker-data/constraint/nested-3.out b/tests/core/constraint/nested-3.out
similarity index 100%
rename from tests/libtracker-data/constraint/nested-3.out
rename to tests/core/constraint/nested-3.out
diff --git a/tests/libtracker-data/constraint/nested-3.rq b/tests/core/constraint/nested-3.rq
similarity index 100%
rename from tests/libtracker-data/constraint/nested-3.rq
rename to tests/core/constraint/nested-3.rq
diff --git a/tests/libtracker-data/constraint/nested-4.out b/tests/core/constraint/nested-4.out
similarity index 100%
rename from tests/libtracker-data/constraint/nested-4.out
rename to tests/core/constraint/nested-4.out
diff --git a/tests/libtracker-data/constraint/nested-4.rq b/tests/core/constraint/nested-4.rq
similarity index 100%
rename from tests/libtracker-data/constraint/nested-4.rq
rename to tests/core/constraint/nested-4.rq
diff --git a/tests/libtracker-data/constraint/nested-5.out b/tests/core/constraint/nested-5.out
similarity index 100%
rename from tests/libtracker-data/constraint/nested-5.out
rename to tests/core/constraint/nested-5.out
diff --git a/tests/libtracker-data/constraint/nested-5.rq b/tests/core/constraint/nested-5.rq
similarity index 100%
rename from tests/libtracker-data/constraint/nested-5.rq
rename to tests/core/constraint/nested-5.rq
diff --git a/tests/libtracker-data/constraint/nested-6.out b/tests/core/constraint/nested-6.out
similarity index 100%
rename from tests/libtracker-data/constraint/nested-6.out
rename to tests/core/constraint/nested-6.out
diff --git a/tests/libtracker-data/constraint/nested-6.rq b/tests/core/constraint/nested-6.rq
similarity index 100%
rename from tests/libtracker-data/constraint/nested-6.rq
rename to tests/core/constraint/nested-6.rq
diff --git a/tests/libtracker-data/constraint/test.ontology b/tests/core/constraint/test.ontology
similarity index 100%
rename from tests/libtracker-data/constraint/test.ontology
rename to tests/core/constraint/test.ontology
diff --git a/tests/libtracker-data/construct/construct-pattern.out 
b/tests/core/construct/construct-pattern.out
similarity index 100%
rename from tests/libtracker-data/construct/construct-pattern.out
rename to tests/core/construct/construct-pattern.out
diff --git a/tests/libtracker-data/construct/construct-pattern.rq b/tests/core/construct/construct-pattern.rq
similarity index 100%
rename from tests/libtracker-data/construct/construct-pattern.rq
rename to tests/core/construct/construct-pattern.rq
diff --git a/tests/libtracker-data/construct/construct-where.out b/tests/core/construct/construct-where.out
similarity index 100%
rename from tests/libtracker-data/construct/construct-where.out
rename to tests/core/construct/construct-where.out
diff --git a/tests/libtracker-data/construct/construct-where.rq b/tests/core/construct/construct-where.rq
similarity index 100%
rename from tests/libtracker-data/construct/construct-where.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/construct/construct-with-modifiers.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/construct/construct-with-modifiers.rq
rename to tests/core/construct/construct-with-modifiers.rq
diff --git a/tests/libtracker-data/construct/data.ttl b/tests/core/construct/data.ttl
similarity index 100%
rename from tests/libtracker-data/construct/data.ttl
rename to tests/core/construct/data.ttl
diff --git a/tests/libtracker-data/construct/test.ontology b/tests/core/construct/test.ontology
similarity index 100%
rename from tests/libtracker-data/construct/test.ontology
rename to tests/core/construct/test.ontology
diff --git a/tests/libtracker-data/datetime/data-1.ttl b/tests/core/datetime/data-1.ttl
similarity index 100%
rename from tests/libtracker-data/datetime/data-1.ttl
rename to tests/core/datetime/data-1.ttl
diff --git a/tests/libtracker-data/datetime/data-2.ttl b/tests/core/datetime/data-2.ttl
similarity index 100%
rename from tests/libtracker-data/datetime/data-2.ttl
rename to tests/core/datetime/data-2.ttl
diff --git a/tests/libtracker-data/datetime/data-3.rq b/tests/core/datetime/data-3.rq
similarity index 100%
rename from tests/libtracker-data/datetime/data-3.rq
rename to tests/core/datetime/data-3.rq
diff --git a/tests/libtracker-data/datetime/data-4.rq b/tests/core/datetime/data-4.rq
similarity index 100%
rename from tests/libtracker-data/datetime/data-4.rq
rename to tests/core/datetime/data-4.rq
diff --git a/tests/libtracker-data/datetime/delete-1.out b/tests/core/datetime/delete-1.out
similarity index 100%
rename from tests/libtracker-data/datetime/delete-1.out
rename to tests/core/datetime/delete-1.out
diff --git a/tests/libtracker-data/datetime/delete-1.rq b/tests/core/datetime/delete-1.rq
similarity index 100%
rename from tests/libtracker-data/datetime/delete-1.rq
rename to tests/core/datetime/delete-1.rq
diff --git a/tests/libtracker-data/datetime/direct-1.out b/tests/core/datetime/direct-1.out
similarity index 100%
rename from tests/libtracker-data/datetime/direct-1.out
rename to tests/core/datetime/direct-1.out
diff --git a/tests/libtracker-data/datetime/direct-1.rq b/tests/core/datetime/direct-1.rq
similarity index 100%
rename from tests/libtracker-data/datetime/direct-1.rq
rename to tests/core/datetime/direct-1.rq
diff --git a/tests/libtracker-data/datetime/filter-1.out b/tests/core/datetime/filter-1.out
similarity index 100%
rename from tests/libtracker-data/datetime/filter-1.out
rename to tests/core/datetime/filter-1.out
diff --git a/tests/libtracker-data/datetime/filter-1.rq b/tests/core/datetime/filter-1.rq
similarity index 100%
rename from tests/libtracker-data/datetime/filter-1.rq
rename to tests/core/datetime/filter-1.rq
diff --git a/tests/libtracker-data/datetime/filter-2.out b/tests/core/datetime/filter-2.out
similarity index 100%
rename from tests/libtracker-data/datetime/filter-2.out
rename to tests/core/datetime/filter-2.out
diff --git a/tests/libtracker-data/datetime/filter-2.rq b/tests/core/datetime/filter-2.rq
similarity index 100%
rename from tests/libtracker-data/datetime/filter-2.rq
rename to tests/core/datetime/filter-2.rq
diff --git a/tests/libtracker-data/datetime/filter-3.out b/tests/core/datetime/filter-3.out
similarity index 100%
rename from tests/libtracker-data/datetime/filter-3.out
rename to tests/core/datetime/filter-3.out
diff --git a/tests/libtracker-data/datetime/filter-3.rq b/tests/core/datetime/filter-3.rq
similarity index 100%
rename from tests/libtracker-data/datetime/filter-3.rq
rename to tests/core/datetime/filter-3.rq
diff --git a/tests/libtracker-data/datetime/filter-4.out b/tests/core/datetime/filter-4.out
similarity index 100%
rename from tests/libtracker-data/datetime/filter-4.out
rename to tests/core/datetime/filter-4.out
diff --git a/tests/libtracker-data/datetime/filter-4.rq b/tests/core/datetime/filter-4.rq
similarity index 100%
rename from tests/libtracker-data/datetime/filter-4.rq
rename to tests/core/datetime/filter-4.rq
diff --git a/tests/libtracker-data/datetime/filter-5.out b/tests/core/datetime/filter-5.out
similarity index 100%
rename from tests/libtracker-data/datetime/filter-5.out
rename to tests/core/datetime/filter-5.out
diff --git a/tests/libtracker-data/datetime/filter-5.rq b/tests/core/datetime/filter-5.rq
similarity index 100%
rename from tests/libtracker-data/datetime/filter-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-localtime-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-localtime-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-timezone-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-timezone-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-timezone-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-timezone-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-timezone-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-timezone-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-tz-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/datetime/functions-tz-1.rq
rename to tests/core/datetime/functions-tz-1.rq
diff --git a/tests/libtracker-data/datetime/insert-1.out b/tests/core/datetime/insert-1.out
similarity index 100%
rename from tests/libtracker-data/datetime/insert-1.out
rename to tests/core/datetime/insert-1.out
diff --git a/tests/libtracker-data/datetime/insert-1.rq b/tests/core/datetime/insert-1.rq
similarity index 100%
rename from tests/libtracker-data/datetime/insert-1.rq
rename to tests/core/datetime/insert-1.rq
diff --git a/tests/libtracker-data/datetime/test.ontology b/tests/core/datetime/test.ontology
similarity index 100%
rename from tests/libtracker-data/datetime/test.ontology
rename to tests/core/datetime/test.ontology
diff --git a/tests/libtracker-data/dawg-testcases b/tests/core/dawg-testcases
similarity index 100%
rename from tests/libtracker-data/dawg-testcases
rename to tests/core/dawg-testcases
diff --git a/tests/libtracker-data/describe/data.ttl b/tests/core/describe/data.ttl
similarity index 100%
rename from tests/libtracker-data/describe/data.ttl
rename to tests/core/describe/data.ttl
diff --git a/tests/libtracker-data/describe/describe-limit.out b/tests/core/describe/describe-limit.out
similarity index 100%
rename from tests/libtracker-data/describe/describe-limit.out
rename to tests/core/describe/describe-limit.out
diff --git a/tests/libtracker-data/describe/describe-limit.rq b/tests/core/describe/describe-limit.rq
similarity index 100%
rename from tests/libtracker-data/describe/describe-limit.rq
rename to tests/core/describe/describe-limit.rq
diff --git a/tests/libtracker-data/describe/describe-multiple.out b/tests/core/describe/describe-multiple.out
similarity index 100%
rename from tests/libtracker-data/describe/describe-multiple.out
rename to tests/core/describe/describe-multiple.out
diff --git a/tests/libtracker-data/describe/describe-multiple.rq b/tests/core/describe/describe-multiple.rq
similarity index 100%
rename from tests/libtracker-data/describe/describe-multiple.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/describe/describe-non-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/describe/describe-non-existent.rq
rename to tests/core/describe/describe-non-existent.rq
diff --git a/tests/libtracker-data/describe/describe-pattern.out b/tests/core/describe/describe-pattern.out
similarity index 100%
rename from tests/libtracker-data/describe/describe-pattern.out
rename to tests/core/describe/describe-pattern.out
diff --git a/tests/libtracker-data/describe/describe-pattern.rq b/tests/core/describe/describe-pattern.rq
similarity index 100%
rename from tests/libtracker-data/describe/describe-pattern.rq
rename to tests/core/describe/describe-pattern.rq
diff --git a/tests/libtracker-data/describe/describe-single.out b/tests/core/describe/describe-single.out
similarity index 100%
rename from tests/libtracker-data/describe/describe-single.out
rename to tests/core/describe/describe-single.out
diff --git a/tests/libtracker-data/describe/describe-single.rq b/tests/core/describe/describe-single.rq
similarity index 100%
rename from tests/libtracker-data/describe/describe-single.rq
rename to tests/core/describe/describe-single.rq
diff --git a/tests/libtracker-data/describe/test.ontology b/tests/core/describe/test.ontology
similarity index 100%
rename from tests/libtracker-data/describe/test.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/bind-reused-same-pattern.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/bind-reused-same-pattern.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/query-error-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/query-error-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/query-error-1.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/query-error-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/query-error-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/query-error-2.ttl
rename to tests/core/error/query-error-2.ttl
diff --git a/tests/libtracker-data/error/test.ontology b/tests/core/error/test.ontology
similarity index 100%
rename from tests/libtracker-data/error/test.ontology
rename to tests/core/error/test.ontology
diff --git a/tests/libtracker-data/error/update-error-1.rq b/tests/core/error/update-error-1.rq
similarity index 100%
rename from tests/libtracker-data/error/update-error-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/update-error-query-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/error/update-error-query-1.rq
rename to tests/core/error/update-error-query-1.rq
diff --git a/tests/libtracker-data/example.index b/tests/core/example.index
similarity index 100%
rename from tests/libtracker-data/example.index
rename to tests/core/example.index
diff --git a/tests/libtracker-data/expr-ops/data.ontology b/tests/core/expr-ops/data.ontology
similarity index 100%
rename from tests/libtracker-data/expr-ops/data.ontology
rename to tests/core/expr-ops/data.ontology
diff --git a/tests/libtracker-data/expr-ops/data.ttl b/tests/core/expr-ops/data.ttl
similarity index 100%
rename from tests/libtracker-data/expr-ops/data.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-ge-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-ge-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-le-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-le-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-minus-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-minus-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-mul-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-mul-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-plus-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-plus-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-res-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-res-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-unminus-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-unminus-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-unplus-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/expr-ops/query-unplus-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/data-1.ttl
rename to tests/core/functions/data-1.ttl
diff --git a/tests/libtracker-data/functions/data-2.ttl b/tests/core/functions/data-2.ttl
similarity index 100%
rename from tests/libtracker-data/functions/data-2.ttl
rename to tests/core/functions/data-2.ttl
diff --git a/tests/libtracker-data/functions/data-3.ttl b/tests/core/functions/data-3.ttl
similarity index 100%
rename from tests/libtracker-data/functions/data-3.ttl
rename to tests/core/functions/data-3.ttl
diff --git a/tests/libtracker-data/functions/data-4.ttl b/tests/core/functions/data-4.ttl
similarity index 100%
rename from tests/libtracker-data/functions/data-4.ttl
rename to tests/core/functions/data-4.ttl
diff --git a/tests/libtracker-data/functions/data-5.ttl b/tests/core/functions/data-5.ttl
similarity index 100%
rename from tests/libtracker-data/functions/data-5.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-abs-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-abs-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-bnode-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-bnode-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-bnode-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-bnode-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-ceil-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-ceil-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-contains-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-contains-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-day-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-day-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-encode-for-uri-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-encode-for-uri-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-floor-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-floor-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-hash-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-hash-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-hours-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-hours-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-if-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-if-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-lcase-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-lcase-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-minutes-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-minutes-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-month-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-month-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-now-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-now-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-rand-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-rand-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-replace-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-round-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-round-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-sameterm-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-sameterm-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-seconds-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-seconds-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-strafter-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-strafter-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-strbefore-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-strbefore-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-strdt-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-strdt-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-strlen-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-strlen-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-substr-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-substr-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-ucase-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-ucase-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-uri-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-uri-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-uuid-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-uuid-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-year-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-builtin-year-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-cast-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-cast-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-cast-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-cast-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-coalesce-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-coalesce-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-datatypes-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-property-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-property-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-property-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-property-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-6.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-6.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-7.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-7.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-8.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-8.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-9.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-9.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-loc-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-tracker-loc-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-10.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-10.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-11.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-11.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-12.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-12.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-13.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-13.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-14.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-14.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-15.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-15.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-6.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-6.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-7.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-7.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-8.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-8.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-9.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/functions/functions-xpath-9.rq
rename to tests/core/functions/functions-xpath-9.rq
diff --git a/tests/libtracker-data/functions/test-1.ontology b/tests/core/functions/test-1.ontology
similarity index 100%
rename from tests/libtracker-data/functions/test-1.ontology
rename to tests/core/functions/test-1.ontology
diff --git a/tests/libtracker-data/functions/test-2.ontology b/tests/core/functions/test-2.ontology
similarity index 100%
rename from tests/libtracker-data/functions/test-2.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-from-default.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-from-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-from-non-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-from-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-into-self.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-into-self.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-to-default.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-to-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-to-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-to-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-to-non-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/add-to-non-existent.rq
rename to tests/core/graph/add-to-non-existent.rq
diff --git a/tests/libtracker-data/graph/add.out b/tests/core/graph/add.out
similarity index 100%
rename from tests/libtracker-data/graph/add.out
rename to tests/core/graph/add.out
diff --git a/tests/libtracker-data/graph/add.rq b/tests/core/graph/add.rq
similarity index 100%
rename from tests/libtracker-data/graph/add.rq
rename to tests/core/graph/add.rq
diff --git a/tests/libtracker-data/graph/clear-all.out b/tests/core/graph/clear-all.out
similarity index 100%
rename from tests/libtracker-data/graph/clear-all.out
rename to tests/core/graph/clear-all.out
diff --git a/tests/libtracker-data/graph/clear-all.rq b/tests/core/graph/clear-all.rq
similarity index 100%
rename from tests/libtracker-data/graph/clear-all.rq
rename to tests/core/graph/clear-all.rq
diff --git a/tests/libtracker-data/graph/clear-default.out b/tests/core/graph/clear-default.out
similarity index 100%
rename from tests/libtracker-data/graph/clear-default.out
rename to tests/core/graph/clear-default.out
diff --git a/tests/libtracker-data/graph/clear-default.rq b/tests/core/graph/clear-default.rq
similarity index 100%
rename from tests/libtracker-data/graph/clear-default.rq
rename to tests/core/graph/clear-default.rq
diff --git a/tests/libtracker-data/graph/clear-named.out b/tests/core/graph/clear-named.out
similarity index 100%
rename from tests/libtracker-data/graph/clear-named.out
rename to tests/core/graph/clear-named.out
diff --git a/tests/libtracker-data/graph/clear-named.rq b/tests/core/graph/clear-named.rq
similarity index 100%
rename from tests/libtracker-data/graph/clear-named.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/clear-non-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/clear-non-existent.rq
rename to tests/core/graph/clear-non-existent.rq
diff --git a/tests/libtracker-data/graph/clear.out b/tests/core/graph/clear.out
similarity index 100%
rename from tests/libtracker-data/graph/clear.out
rename to tests/core/graph/clear.out
diff --git a/tests/libtracker-data/graph/clear.rq b/tests/core/graph/clear.rq
similarity index 100%
rename from tests/libtracker-data/graph/clear.rq
rename to tests/core/graph/clear.rq
diff --git a/tests/libtracker-data/graph/copy-from-default.out b/tests/core/graph/copy-from-default.out
similarity index 100%
rename from tests/libtracker-data/graph/copy-from-default.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-from-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-from-non-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-from-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-into-self.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-into-self.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-to-default.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-to-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-to-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-to-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-to-non-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/copy-to-non-existent.rq
rename to tests/core/graph/copy-to-non-existent.rq
diff --git a/tests/libtracker-data/graph/copy.out b/tests/core/graph/copy.out
similarity index 100%
rename from tests/libtracker-data/graph/copy.out
rename to tests/core/graph/copy.out
diff --git a/tests/libtracker-data/graph/copy.rq b/tests/core/graph/copy.rq
similarity index 100%
rename from tests/libtracker-data/graph/copy.rq
rename to tests/core/graph/copy.rq
diff --git a/tests/libtracker-data/graph/data-1.rq b/tests/core/graph/data-1.rq
similarity index 100%
rename from tests/libtracker-data/graph/data-1.rq
rename to tests/core/graph/data-1.rq
diff --git a/tests/libtracker-data/graph/data-2.rq b/tests/core/graph/data-2.rq
similarity index 100%
rename from tests/libtracker-data/graph/data-2.rq
rename to tests/core/graph/data-2.rq
diff --git a/tests/libtracker-data/graph/data-3.rq b/tests/core/graph/data-3.rq
similarity index 100%
rename from tests/libtracker-data/graph/data-3.rq
rename to tests/core/graph/data-3.rq
diff --git a/tests/libtracker-data/graph/data-4.rq b/tests/core/graph/data-4.rq
similarity index 100%
rename from tests/libtracker-data/graph/data-4.rq
rename to tests/core/graph/data-4.rq
diff --git a/tests/libtracker-data/graph/data-5.rq b/tests/core/graph/data-5.rq
similarity index 100%
rename from tests/libtracker-data/graph/data-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-add-from-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-add-from-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-add-into-self.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-add-to-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-add-to-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-add-to-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-add.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-clear-all.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-clear-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-clear-named.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-clear-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-clear.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-copy-from-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-copy-from-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-copy-into-self.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-copy-to-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-copy-to-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-copy-to-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-copy.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-drop-all.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-drop-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-drop-named.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-drop-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-drop-silent.rq
rename to tests/core/graph/data-drop-silent.rq
diff --git a/tests/libtracker-data/graph/data-drop.rq b/tests/core/graph/data-drop.rq
similarity index 100%
rename from tests/libtracker-data/graph/data-drop.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-move-from-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-move-from-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-move-into-self.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-move-to-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-move-to-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/data-move.rq
rename to tests/core/graph/data-move.rq
diff --git a/tests/libtracker-data/graph/drop-all.out b/tests/core/graph/drop-all.out
similarity index 100%
rename from tests/libtracker-data/graph/drop-all.out
rename to tests/core/graph/drop-all.out
diff --git a/tests/libtracker-data/graph/drop-all.rq b/tests/core/graph/drop-all.rq
similarity index 100%
rename from tests/libtracker-data/graph/drop-all.rq
rename to tests/core/graph/drop-all.rq
diff --git a/tests/libtracker-data/graph/drop-default.out b/tests/core/graph/drop-default.out
similarity index 100%
rename from tests/libtracker-data/graph/drop-default.out
rename to tests/core/graph/drop-default.out
diff --git a/tests/libtracker-data/graph/drop-default.rq b/tests/core/graph/drop-default.rq
similarity index 100%
rename from tests/libtracker-data/graph/drop-default.rq
rename to tests/core/graph/drop-default.rq
diff --git a/tests/libtracker-data/graph/drop-named.out b/tests/core/graph/drop-named.out
similarity index 100%
rename from tests/libtracker-data/graph/drop-named.out
rename to tests/core/graph/drop-named.out
diff --git a/tests/libtracker-data/graph/drop-named.rq b/tests/core/graph/drop-named.rq
similarity index 100%
rename from tests/libtracker-data/graph/drop-named.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/drop-non-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/drop-non-existent.rq
rename to tests/core/graph/drop-non-existent.rq
diff --git a/tests/libtracker-data/graph/drop-silent.out b/tests/core/graph/drop-silent.out
similarity index 100%
rename from tests/libtracker-data/graph/drop-silent.out
rename to tests/core/graph/drop-silent.out
diff --git a/tests/libtracker-data/graph/drop-silent.rq b/tests/core/graph/drop-silent.rq
similarity index 100%
rename from tests/libtracker-data/graph/drop-silent.rq
rename to tests/core/graph/drop-silent.rq
diff --git a/tests/libtracker-data/graph/drop.out b/tests/core/graph/drop.out
similarity index 100%
rename from tests/libtracker-data/graph/drop.out
rename to tests/core/graph/drop.out
diff --git a/tests/libtracker-data/graph/drop.rq b/tests/core/graph/drop.rq
similarity index 100%
rename from tests/libtracker-data/graph/drop.rq
rename to tests/core/graph/drop.rq
diff --git a/tests/libtracker-data/graph/graph-1.out b/tests/core/graph/graph-1.out
similarity index 100%
rename from tests/libtracker-data/graph/graph-1.out
rename to tests/core/graph/graph-1.out
diff --git a/tests/libtracker-data/graph/graph-1.rq b/tests/core/graph/graph-1.rq
similarity index 100%
rename from tests/libtracker-data/graph/graph-1.rq
rename to tests/core/graph/graph-1.rq
diff --git a/tests/libtracker-data/graph/graph-2.out b/tests/core/graph/graph-2.out
similarity index 100%
rename from tests/libtracker-data/graph/graph-2.out
rename to tests/core/graph/graph-2.out
diff --git a/tests/libtracker-data/graph/graph-2.rq b/tests/core/graph/graph-2.rq
similarity index 100%
rename from tests/libtracker-data/graph/graph-2.rq
rename to tests/core/graph/graph-2.rq
diff --git a/tests/libtracker-data/graph/graph-3.out b/tests/core/graph/graph-3.out
similarity index 100%
rename from tests/libtracker-data/graph/graph-3.out
rename to tests/core/graph/graph-3.out
diff --git a/tests/libtracker-data/graph/graph-3.rq b/tests/core/graph/graph-3.rq
similarity index 100%
rename from tests/libtracker-data/graph/graph-3.rq
rename to tests/core/graph/graph-3.rq
diff --git a/tests/libtracker-data/graph/graph-4.out b/tests/core/graph/graph-4.out
similarity index 100%
rename from tests/libtracker-data/graph/graph-4.out
rename to tests/core/graph/graph-4.out
diff --git a/tests/libtracker-data/graph/graph-4.rq b/tests/core/graph/graph-4.rq
similarity index 100%
rename from tests/libtracker-data/graph/graph-4.rq
rename to tests/core/graph/graph-4.rq
diff --git a/tests/libtracker-data/graph/graph-5.out b/tests/core/graph/graph-5.out
similarity index 100%
rename from tests/libtracker-data/graph/graph-5.out
rename to tests/core/graph/graph-5.out
diff --git a/tests/libtracker-data/graph/graph-5.rq b/tests/core/graph/graph-5.rq
similarity index 100%
rename from tests/libtracker-data/graph/graph-5.rq
rename to tests/core/graph/graph-5.rq
diff --git a/tests/libtracker-data/graph/graph-6.out b/tests/core/graph/graph-6.out
similarity index 100%
rename from tests/libtracker-data/graph/graph-6.out
rename to tests/core/graph/graph-6.out
diff --git a/tests/libtracker-data/graph/graph-6.rq b/tests/core/graph/graph-6.rq
similarity index 100%
rename from tests/libtracker-data/graph/graph-6.rq
rename to tests/core/graph/graph-6.rq
diff --git a/tests/libtracker-data/graph/graph-7.out b/tests/core/graph/graph-7.out
similarity index 100%
rename from tests/libtracker-data/graph/graph-7.out
rename to tests/core/graph/graph-7.out
diff --git a/tests/libtracker-data/graph/graph-7.rq b/tests/core/graph/graph-7.rq
similarity index 100%
rename from tests/libtracker-data/graph/graph-7.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/graph-unbound-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/graph-unbound-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/graph-unbound-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/graph-unbound-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/graph-unbound-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/graph-unbound-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-from-default.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-from-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-from-non-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-from-non-existent.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-into-self.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-into-self.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-to-default.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-to-default.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-to-existent.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/move-to-existent.rq
rename to tests/core/graph/move-to-existent.rq
diff --git a/tests/libtracker-data/graph/move.out b/tests/core/graph/move.out
similarity index 100%
rename from tests/libtracker-data/graph/move.out
rename to tests/core/graph/move.out
diff --git a/tests/libtracker-data/graph/move.rq b/tests/core/graph/move.rq
similarity index 100%
rename from tests/libtracker-data/graph/move.rq
rename to tests/core/graph/move.rq
diff --git a/tests/libtracker-data/graph/non-existent-1.out b/tests/core/graph/non-existent-1.out
similarity index 100%
rename from tests/libtracker-data/graph/non-existent-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/non-existent-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/non-existent-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/non-existent-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/non-existent-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/graph/non-existent-3.rq
rename to tests/core/graph/non-existent-3.rq
diff --git a/tests/libtracker-data/graph/test.ontology b/tests/core/graph/test.ontology
similarity index 100%
rename from tests/libtracker-data/graph/test.ontology
rename to tests/core/graph/test.ontology
diff --git a/tests/libtracker-data/inline/data.ttl b/tests/core/inline/data.ttl
similarity index 100%
rename from tests/libtracker-data/inline/data.ttl
rename to tests/core/inline/data.ttl
diff --git a/tests/libtracker-data/inline/inline-1.out b/tests/core/inline/inline-1.out
similarity index 100%
rename from tests/libtracker-data/inline/inline-1.out
rename to tests/core/inline/inline-1.out
diff --git a/tests/libtracker-data/inline/inline-1.rq b/tests/core/inline/inline-1.rq
similarity index 100%
rename from tests/libtracker-data/inline/inline-1.rq
rename to tests/core/inline/inline-1.rq
diff --git a/tests/libtracker-data/inline/inline-2.out b/tests/core/inline/inline-2.out
similarity index 100%
rename from tests/libtracker-data/inline/inline-2.out
rename to tests/core/inline/inline-2.out
diff --git a/tests/libtracker-data/inline/inline-2.rq b/tests/core/inline/inline-2.rq
similarity index 100%
rename from tests/libtracker-data/inline/inline-2.rq
rename to tests/core/inline/inline-2.rq
diff --git a/tests/libtracker-data/inline/inline-3.out b/tests/core/inline/inline-3.out
similarity index 100%
rename from tests/libtracker-data/inline/inline-3.out
rename to tests/core/inline/inline-3.out
diff --git a/tests/libtracker-data/inline/inline-3.rq b/tests/core/inline/inline-3.rq
similarity index 100%
rename from tests/libtracker-data/inline/inline-3.rq
rename to tests/core/inline/inline-3.rq
diff --git a/tests/libtracker-data/inline/inline-4.out b/tests/core/inline/inline-4.out
similarity index 100%
rename from tests/libtracker-data/inline/inline-4.out
rename to tests/core/inline/inline-4.out
diff --git a/tests/libtracker-data/inline/inline-4.rq b/tests/core/inline/inline-4.rq
similarity index 100%
rename from tests/libtracker-data/inline/inline-4.rq
rename to tests/core/inline/inline-4.rq
diff --git a/tests/libtracker-data/inline/inline-5.out b/tests/core/inline/inline-5.out
similarity index 100%
rename from tests/libtracker-data/inline/inline-5.out
rename to tests/core/inline/inline-5.out
diff --git a/tests/libtracker-data/inline/inline-5.rq b/tests/core/inline/inline-5.rq
similarity index 100%
rename from tests/libtracker-data/inline/inline-5.rq
rename to tests/core/inline/inline-5.rq
diff --git a/tests/libtracker-data/inline/inline-6.out b/tests/core/inline/inline-6.out
similarity index 100%
rename from tests/libtracker-data/inline/inline-6.out
rename to tests/core/inline/inline-6.out
diff --git a/tests/libtracker-data/inline/inline-6.rq b/tests/core/inline/inline-6.rq
similarity index 100%
rename from tests/libtracker-data/inline/inline-6.rq
rename to tests/core/inline/inline-6.rq
diff --git a/tests/libtracker-data/inline/inline-7.out b/tests/core/inline/inline-7.out
similarity index 100%
rename from tests/libtracker-data/inline/inline-7.out
rename to tests/core/inline/inline-7.out
diff --git a/tests/libtracker-data/inline/inline-7.rq b/tests/core/inline/inline-7.rq
similarity index 100%
rename from tests/libtracker-data/inline/inline-7.rq
rename to tests/core/inline/inline-7.rq
diff --git a/tests/libtracker-data/inline/inline-8.out b/tests/core/inline/inline-8.out
similarity index 100%
rename from tests/libtracker-data/inline/inline-8.out
rename to tests/core/inline/inline-8.out
diff --git a/tests/libtracker-data/inline/inline-8.rq b/tests/core/inline/inline-8.rq
similarity index 100%
rename from tests/libtracker-data/inline/inline-8.rq
rename to tests/core/inline/inline-8.rq
diff --git a/tests/libtracker-data/inline/inline-9.out b/tests/core/inline/inline-9.out
similarity index 100%
rename from tests/libtracker-data/inline/inline-9.out
rename to tests/core/inline/inline-9.out
diff --git a/tests/libtracker-data/inline/inline-9.rq b/tests/core/inline/inline-9.rq
similarity index 100%
rename from tests/libtracker-data/inline/inline-9.rq
rename to tests/core/inline/inline-9.rq
diff --git a/tests/libtracker-data/inline/test.ontology b/tests/core/inline/test.ontology
similarity index 100%
rename from tests/libtracker-data/inline/test.ontology
rename to tests/core/inline/test.ontology
diff --git a/tests/libtracker-data/inline/values-1.out b/tests/core/inline/values-1.out
similarity index 100%
rename from tests/libtracker-data/inline/values-1.out
rename to tests/core/inline/values-1.out
diff --git a/tests/libtracker-data/inline/values-1.rq b/tests/core/inline/values-1.rq
similarity index 100%
rename from tests/libtracker-data/inline/values-1.rq
rename to tests/core/inline/values-1.rq
diff --git a/tests/libtracker-data/inline/values-2.out b/tests/core/inline/values-2.out
similarity index 100%
rename from tests/libtracker-data/inline/values-2.out
rename to tests/core/inline/values-2.out
diff --git a/tests/libtracker-data/inline/values-2.rq b/tests/core/inline/values-2.rq
similarity index 100%
rename from tests/libtracker-data/inline/values-2.rq
rename to tests/core/inline/values-2.rq
diff --git a/tests/libtracker-data/inline/values-3.out b/tests/core/inline/values-3.out
similarity index 100%
rename from tests/libtracker-data/inline/values-3.out
rename to tests/core/inline/values-3.out
diff --git a/tests/libtracker-data/inline/values-3.rq b/tests/core/inline/values-3.rq
similarity index 100%
rename from tests/libtracker-data/inline/values-3.rq
rename to tests/core/inline/values-3.rq
diff --git a/tests/libtracker-data/inline/values-4.out b/tests/core/inline/values-4.out
similarity index 100%
rename from tests/libtracker-data/inline/values-4.out
rename to tests/core/inline/values-4.out
diff --git a/tests/libtracker-data/inline/values-4.rq b/tests/core/inline/values-4.rq
similarity index 100%
rename from tests/libtracker-data/inline/values-4.rq
rename to tests/core/inline/values-4.rq
diff --git a/tests/libtracker-data/langstring/data.rq b/tests/core/langstring/data.rq
similarity index 100%
rename from tests/libtracker-data/langstring/data.rq
rename to tests/core/langstring/data.rq
diff --git a/tests/libtracker-data/langstring/langmatches.out b/tests/core/langstring/langmatches.out
similarity index 100%
rename from tests/libtracker-data/langstring/langmatches.out
rename to tests/core/langstring/langmatches.out
diff --git a/tests/libtracker-data/langstring/langmatches.rq b/tests/core/langstring/langmatches.rq
similarity index 100%
rename from tests/libtracker-data/langstring/langmatches.rq
rename to tests/core/langstring/langmatches.rq
diff --git a/tests/libtracker-data/langstring/match-non-langstring.out 
b/tests/core/langstring/match-non-langstring.out
similarity index 100%
rename from tests/libtracker-data/langstring/match-non-langstring.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/langstring/match-non-langstring.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/langstring/match-with-langstring.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/langstring/match-with-langstring.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/langstring/match-with-non-langstring.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/langstring/match-with-non-langstring.rq
rename to tests/core/langstring/match-with-non-langstring.rq
diff --git a/tests/libtracker-data/langstring/strlang.out b/tests/core/langstring/strlang.out
similarity index 100%
rename from tests/libtracker-data/langstring/strlang.out
rename to tests/core/langstring/strlang.out
diff --git a/tests/libtracker-data/langstring/strlang.rq b/tests/core/langstring/strlang.rq
similarity index 100%
rename from tests/libtracker-data/langstring/strlang.rq
rename to tests/core/langstring/strlang.rq
diff --git a/tests/libtracker-data/langstring/test.ontology b/tests/core/langstring/test.ontology
similarity index 100%
rename from tests/libtracker-data/langstring/test.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/data-list-in-object.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/data-list-in-select.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/data-list-in-subject.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/data-list-nested.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/list-in-object.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/list-in-object.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/list-in-select.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/list-in-select.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/list-in-subject.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/lists/list-in-subject.rq
rename to tests/core/lists/list-in-subject.rq
diff --git a/tests/libtracker-data/lists/list-nested.out b/tests/core/lists/list-nested.out
similarity index 100%
rename from tests/libtracker-data/lists/list-nested.out
rename to tests/core/lists/list-nested.out
diff --git a/tests/libtracker-data/lists/list-nested.rq b/tests/core/lists/list-nested.rq
similarity index 100%
rename from tests/libtracker-data/lists/list-nested.rq
rename to tests/core/lists/list-nested.rq
diff --git a/tests/libtracker-data/lists/test.ontology b/tests/core/lists/test.ontology
similarity index 100%
rename from tests/libtracker-data/lists/test.ontology
rename to tests/core/lists/test.ontology
diff --git a/tests/libtracker-data/meson.build b/tests/core/meson.build
similarity index 94%
rename from tests/libtracker-data/meson.build
rename to 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
similarity index 100%
rename from tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-query-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/mixed-cardinality/insert-mixed-cardinality-query-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/mixed-cardinality/test.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/mixed-cardinality/update-mixed-cardinality-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/mixed-cardinality/update-mixed-cardinality-query-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/mixed-cardinality/update-mixed-cardinality-query-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/data-1.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-characterset-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-characterset-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-comment-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-comment-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-description-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-description-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-generator-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-generator-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-identifier-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-identifier-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-keyword-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-keyword-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-language-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-language-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-legal-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-legal-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-mimetype-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-mimetype-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-plaintextcontent-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-plaintextcontent-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-subject-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-subject-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-title-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-title-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-version-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/nie/filter-version-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/incomplete-property-001.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/incomplete-property-001.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/parsing-errors-001.errors.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/parsing-errors-001.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/parsing-errors-001.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/unknown-prefix-001.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/unknown-prefix-001.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/unknown-prefix-002.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/unknown-prefix-002.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/unknown-prefix-003.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/ontology-error/unknown-prefix-003.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/optional/complex-data-1.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/optional/q-opt-complex-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/optional/q-opt-complex-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/optional/simple-optional-triple.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/optional/simple-optional-triple.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/optional/simple-optional-triple.ttl
rename to tests/core/optional/simple-optional-triple.ttl
diff --git a/tests/libtracker-data/optional/test-1.ontology b/tests/core/optional/test-1.ontology
similarity index 100%
rename from tests/libtracker-data/optional/test-1.ontology
rename to tests/core/optional/test-1.ontology
diff --git a/tests/libtracker-data/optional/test-2.ontology b/tests/core/optional/test-2.ontology
similarity index 100%
rename from tests/libtracker-data/optional/test-2.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/alternative-path-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/alternative-path-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/alternative-path-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/alternative-path-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/alternative-path-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/alternative-path-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/data-2.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/data-3.rq
rename to tests/core/property-paths/data-3.rq
diff --git a/tests/libtracker-data/property-paths/data.ttl b/tests/core/property-paths/data.ttl
similarity index 100%
rename from tests/libtracker-data/property-paths/data.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/inverse-path-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/inverse-path-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/inverse-path-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/inverse-path-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-graphs.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-graphs.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-inverse-and-sequence-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-inverse-and-sequence-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-inverse-and-sequence-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-inverse-and-sequence-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-inverse-and-sequence-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-inverse-and-sequence-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-optional-and-sequence-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-optional-and-sequence-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-optional-and-sequence-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-optional-and-sequence-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-alternative-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-alternative-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-alternative-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-alternative-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-inverse-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-inverse-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-inverse-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-inverse-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-inverse-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-inverse-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/mixed-recursive-and-sequence-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-10.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-10.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-11.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-11.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-6.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-6.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-7.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-7.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-8.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-8.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-9.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/negated-path-9.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/optional-path-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/optional-path-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/optional-path-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/optional-path-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/query-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/recursive-path-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/recursive-path-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/recursive-path-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/recursive-path-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/recursive-path-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/recursive-path-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/sequence-path-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/sequence-path-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/sequence-path-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/sequence-path-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/sequence-path-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/sequence-path-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/property-paths/test.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/regex/regex-data-01.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/regex/regex-query-001.extra.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/regex/regex-query-001.extra.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/regex/regex-query-001.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/regex/regex-query-001.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/regex/regex-query-002.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/regex/regex-query-002.rq
rename to tests/core/regex/regex-query-002.rq
diff --git a/tests/libtracker-data/regex/test.ontology b/tests/core/regex/test.ontology
similarity index 100%
rename from tests/libtracker-data/regex/test.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/run-test-in-tmp-dir.sh
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-after-triples-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-after-triples-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-before-triples-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-before-triples-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-empty-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-empty-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-empty-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-empty-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-local-filter-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-local-filter-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-query-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-query-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-union-with-local-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-union-with-local-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-union-with-local-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-union-with-local-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-union-with-local-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-union-with-local-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-var-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-var-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-var-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/service/service-var-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/data-sort-1.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/data-sort-3.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/data-sort-4.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/data-sort-5.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/data-title-sort-1.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-6.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-6.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-7.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-7.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-8.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-8.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-9.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-sort-9.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-title-sort-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/sort/query-title-sort-1.rq
rename to tests/core/sort/query-title-sort-1.rq
diff --git a/tests/libtracker-data/sort/test.ontology b/tests/core/sort/test.ontology
similarity index 100%
rename from tests/libtracker-data/sort/test.ontology
rename to tests/core/sort/test.ontology
diff --git a/tests/libtracker-data/subqueries/data-1.ttl b/tests/core/subqueries/data-1.ttl
similarity index 100%
rename from tests/libtracker-data/subqueries/data-1.ttl
rename to tests/core/subqueries/data-1.ttl
diff --git a/tests/libtracker-data/subqueries/subqueries-1.out b/tests/core/subqueries/subqueries-1.out
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-1.out
rename to tests/core/subqueries/subqueries-1.out
diff --git a/tests/libtracker-data/subqueries/subqueries-1.rq b/tests/core/subqueries/subqueries-1.rq
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-minus-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-union-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-union-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-union-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-union-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-union-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-union-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-union-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/subqueries/subqueries-union-4.rq
rename to tests/core/subqueries/subqueries-union-4.rq
diff --git a/tests/libtracker-data/subqueries/test.ontology b/tests/core/subqueries/test.ontology
similarity index 100%
rename from tests/libtracker-data/subqueries/test.ontology
rename to 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
similarity index 98%
rename from tests/libtracker-data/tracker-insert-or-replace-test.c
rename to 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
similarity index 98%
rename from tests/libtracker-data/tracker-ontology-change-test.c
rename to 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
similarity index 98%
rename from tests/libtracker-data/tracker-ontology-error-test.c
rename to 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
similarity index 97%
rename from tests/libtracker-data/tracker-ontology-test.c
rename to 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
similarity index 97%
rename from tests/libtracker-data/tracker-service-test.c
rename to 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
similarity index 98%
rename from tests/libtracker-data/tracker-sparql-blank-test.c
rename to 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
similarity index 99%
rename from tests/libtracker-data/tracker-sparql-test.c
rename to 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
similarity index 100%
rename from tests/libtracker-data/turtle-comments/test.ontology
rename to 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
similarity index 100%
rename from tests/libtracker-data/turtle-comments/turtle-data-001.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/turtle-comments/turtle-query-001.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/turtle-comments/turtle-query-001.rq
rename to tests/core/turtle-comments/turtle-query-001.rq
diff --git a/tests/libtracker-data/turtle/test.ontology b/tests/core/turtle/test.ontology
similarity index 100%
rename from tests/libtracker-data/turtle/test.ontology
rename to tests/core/turtle/test.ontology
diff --git a/tests/libtracker-data/turtle/turtle-data-001.ttl b/tests/core/turtle/turtle-data-001.ttl
similarity index 100%
rename from tests/libtracker-data/turtle/turtle-data-001.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/turtle/turtle-data-002.ttl
rename to 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
similarity index 100%
rename from tests/libtracker-data/turtle/turtle-query-001.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/turtle/turtle-query-001.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/turtle/turtle-query-002.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/turtle/turtle-query-002.rq
rename to tests/core/turtle/turtle-query-002.rq
diff --git a/tests/libtracker-data/unbound/data.ontology b/tests/core/unbound/data.ontology
similarity index 100%
rename from tests/libtracker-data/unbound/data.ontology
rename to tests/core/unbound/data.ontology
diff --git a/tests/libtracker-data/unbound/data.ttl b/tests/core/unbound/data.ttl
similarity index 100%
rename from tests/libtracker-data/unbound/data.ttl
rename to tests/core/unbound/data.ttl
diff --git a/tests/libtracker-data/unbound/unbound-1.out b/tests/core/unbound/unbound-1.out
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-1.out
rename to tests/core/unbound/unbound-1.out
diff --git a/tests/libtracker-data/unbound/unbound-1.rq b/tests/core/unbound/unbound-1.rq
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-1.rq
rename to tests/core/unbound/unbound-1.rq
diff --git a/tests/libtracker-data/unbound/unbound-2.out b/tests/core/unbound/unbound-2.out
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-2.out
rename to tests/core/unbound/unbound-2.out
diff --git a/tests/libtracker-data/unbound/unbound-2.rq b/tests/core/unbound/unbound-2.rq
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-2.rq
rename to tests/core/unbound/unbound-2.rq
diff --git a/tests/libtracker-data/unbound/unbound-3.out b/tests/core/unbound/unbound-3.out
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-3.out
rename to tests/core/unbound/unbound-3.out
diff --git a/tests/libtracker-data/unbound/unbound-3.rq b/tests/core/unbound/unbound-3.rq
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-3.rq
rename to tests/core/unbound/unbound-3.rq
diff --git a/tests/libtracker-data/unbound/unbound-4.out b/tests/core/unbound/unbound-4.out
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-4.out
rename to tests/core/unbound/unbound-4.out
diff --git a/tests/libtracker-data/unbound/unbound-4.rq b/tests/core/unbound/unbound-4.rq
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-4.rq
rename to tests/core/unbound/unbound-4.rq
diff --git a/tests/libtracker-data/unbound/unbound-5.out b/tests/core/unbound/unbound-5.out
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-5.out
rename to tests/core/unbound/unbound-5.out
diff --git a/tests/libtracker-data/unbound/unbound-5.rq b/tests/core/unbound/unbound-5.rq
similarity index 100%
rename from tests/libtracker-data/unbound/unbound-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-data-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-data-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-data-query-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-data-query-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-data-query-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-data-query-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-6.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-4.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-4.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-5.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-5.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-6.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-insert-where-query-6.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-where-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-where-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-where-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-where-query-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-where-query-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-where-query-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-where-query-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-where-query-3.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/delete-where-query-3.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/insert-data-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/insert-data-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/insert-data-query-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/insert-data-query-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/insert-data-query-2.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/insert-data-query-2.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/insert-date-with-offset-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/invalid-insert-where-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/invalid-insert-where-query-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/invalid-insert-where-query-1.rq
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/select-date-with-offset-1.out
rename to 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
similarity index 100%
rename from tests/libtracker-data/update/select-date-with-offset-1.rq
rename to tests/core/update/select-date-with-offset-1.rq
diff --git a/tests/libtracker-data/update/test.ontology b/tests/core/update/test.ontology
similarity index 100%
rename from tests/libtracker-data/update/test.ontology
rename to 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')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]