diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DataFusionProducer/starts_with-datafusion_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DataFusionProducer/starts_with-datafusion_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DataFusionProducer/starts_with-datafusion_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DataFusionProducer/starts_with_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DataFusionProducer/starts_with_plan.json deleted file mode 100644 index 6507ee2e..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DataFusionProducer/starts_with_plan.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "extensions": [ - { - "extensionFunction": { - "extensionUriReference": 4294967295, - "name": "starts_with" - } - } - ], - "relations": [ - { - "root": { - "input": { - "filter": { - "input": { - "read": { - "baseSchema": { - "names": [ - "n_nationkey", - "n_name", - "n_regionkey", - "n_comment" - ] - }, - "projection": { - "select": { - "structItems": [ - { - "field": 1 - } - ] - } - }, - "namedTable": { - "names": [ - "nation" - ] - } - } - }, - "condition": { - "scalarFunction": { - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - } - } - } - }, - { - "value": { - "literal": { - "string": "A" - } - } - } - ] - } - } - } - }, - "names": [ - "n_name" - ] - } - } - ], - "version": { - "minorNumber": 51, - "producer": "datafusion" - } -} \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with-duckdb_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with-duckdb_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with-duckdb_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with_plan.json deleted file mode 100644 index 1436c861..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/DuckDBProducer/starts_with_plan.json +++ /dev/null @@ -1,283 +0,0 @@ -{ - "extensionUris": [ - { - "extensionUriAnchor": 1, - "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/" - }, - { - "extensionUriAnchor": 2, - "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/functions_boolean.yaml" - }, - { - "extensionUriAnchor": 3, - "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/functions_string.yaml" - } - ], - "extensions": [ - { - "extensionFunction": { - "extensionUriReference": 1, - "functionAnchor": 1, - "name": "gte:string_string" - } - }, - { - "extensionFunction": { - "extensionUriReference": 1, - "functionAnchor": 2, - "name": "lt:string_string" - } - }, - { - "extensionFunction": { - "extensionUriReference": 2, - "functionAnchor": 3, - "name": "and:bool?" - } - }, - { - "extensionFunction": { - "extensionUriReference": 1, - "functionAnchor": 4, - "name": "is_not_null:string" - } - }, - { - "extensionFunction": { - "extensionUriReference": 3, - "functionAnchor": 5, - "name": "starts_with:string_string" - } - } - ], - "relations": [ - { - "root": { - "input": { - "project": { - "input": { - "filter": { - "input": { - "read": { - "baseSchema": { - "names": [ - "n_nationkey", - "n_name", - "n_regionkey", - "n_comment" - ], - "struct": { - "types": [ - { - "i32": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "i32": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - } - ], - "nullability": "NULLABILITY_REQUIRED" - } - }, - "filter": { - "scalarFunction": { - "functionReference": 3, - "outputType": { - "bool": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 3, - "outputType": { - "bool": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} - } - } - }, - { - "value": { - "literal": { - "string": "A" - } - } - } - ] - } - } - }, - { - "value": { - "scalarFunction": { - "functionReference": 2, - "outputType": { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} - } - } - }, - { - "value": { - "literal": { - "string": "B" - } - } - } - ] - } - } - } - ] - } - } - }, - { - "value": { - "scalarFunction": { - "functionReference": 4, - "outputType": { - "string": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} - } - } - } - ] - } - } - } - ] - } - }, - "projection": { - "select": { - "structItems": [ - { - "field": 1 - } - ] - }, - "maintainSingularStruct": true - }, - "namedTable": { - "names": [ - "nation" - ] - } - } - }, - "condition": { - "scalarFunction": { - "functionReference": 5, - "outputType": { - "bool": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "literal": { - "string": "A" - } - } - } - ] - } - } - } - }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - ] - } - }, - "names": [ - "n_name" - ] - } - } - ], - "version": { - "minorNumber": 53, - "producer": "DuckDB" - } -} \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/IbisProducer/starts_with-ibis_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/IbisProducer/starts_with-ibis_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/IbisProducer/starts_with-ibis_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/IbisProducer/starts_with_plan.json b/substrait_consumer/tests/functional/extension_functions/string_snapshots/IbisProducer/starts_with_plan.json deleted file mode 100644 index 792608a6..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/IbisProducer/starts_with_plan.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "extensionUris": [ - { - "extensionUriAnchor": 1, - "uri": "https://github.com/substrait-io/substrait/blob/main/extensions/functions_string.yaml" - } - ], - "extensions": [ - { - "extensionFunction": { - "extensionUriReference": 1, - "functionAnchor": 1, - "name": "starts_with:str_str" - } - } - ], - "relations": [ - { - "root": { - "input": { - "filter": { - "input": { - "project": { - "common": { - "emit": { - "outputMapping": [ - 4 - ] - } - }, - "input": { - "read": { - "common": { - "direct": {} - }, - "baseSchema": { - "names": [ - "n_nationkey", - "n_name", - "n_regionkey", - "n_comment" - ], - "struct": { - "types": [ - { - "i32": { - "nullability": "NULLABILITY_REQUIRED" - } - }, - { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - }, - { - "i32": { - "nullability": "NULLABILITY_REQUIRED" - } - }, - { - "string": { - "nullability": "NULLABILITY_REQUIRED" - } - } - ], - "nullability": "NULLABILITY_REQUIRED" - } - }, - "namedTable": { - "names": [ - "nation" - ] - } - } - }, - "expressions": [ - { - "selection": { - "directReference": { - "structField": { - "field": 1 - } - }, - "rootReference": {} - } - } - ] - } - }, - "condition": { - "scalarFunction": { - "functionReference": 1, - "outputType": { - "bool": { - "nullability": "NULLABILITY_NULLABLE" - } - }, - "arguments": [ - { - "value": { - "selection": { - "directReference": { - "structField": {} - }, - "rootReference": {} - } - } - }, - { - "value": { - "literal": { - "string": "A" - } - } - } - ] - } - } - } - }, - "names": [ - "n_name" - ] - } - } - ], - "version": { - "minorNumber": 56, - "producer": "ibis-substrait" - } -} \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-datafusion-acero_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-datafusion-acero_outcome.txt deleted file mode 100644 index c4716c68..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-datafusion-acero_outcome.txt +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-datafusion-datafusion_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-datafusion-datafusion_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-datafusion-datafusion_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-datafusion-duckdb_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-datafusion-duckdb_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-datafusion-duckdb_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-duckdb-acero_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-duckdb-acero_outcome.txt deleted file mode 100644 index c70b321e..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-duckdb-acero_outcome.txt +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-duckdb-datafusion_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-duckdb-datafusion_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-duckdb-datafusion_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-duckdb-duckdb_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-duckdb-duckdb_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-duckdb-duckdb_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-ibis-acero_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-ibis-acero_outcome.txt deleted file mode 100644 index c70b321e..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-ibis-acero_outcome.txt +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-ibis-datafusion_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-ibis-datafusion_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-ibis-datafusion_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-ibis-duckdb_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-ibis-duckdb_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with-ibis-duckdb_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with_outcome.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with_outcome.txt deleted file mode 100644 index 4791ed55..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with_outcome.txt +++ /dev/null @@ -1 +0,0 @@ -True \ No newline at end of file diff --git a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with_result.txt b/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with_result.txt deleted file mode 100644 index 444800dd..00000000 --- a/substrait_consumer/tests/functional/extension_functions/string_snapshots/function_test_results/starts_with_result.txt +++ /dev/null @@ -1,3 +0,0 @@ -ALGERIA -ARGENTINA - \ No newline at end of file diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_in_subquery-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_in_subquery-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_in_subquery-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_in_subquery-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_computation-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_computation-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_computation-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_computation-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_group_by-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_group_by-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_cube-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_group_by_cube-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_cube-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_group_by_cube-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_rollup-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_group_by_rollup-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_group_by_rollup-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_group_by_rollup-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_grouping_set-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_grouping_set-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/aggregate_with_grouping_set-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/aggregate_with_grouping_set-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/computation_between_aggregates-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/computation_between_aggregates-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/computation_between_aggregates-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/computation_between_aggregates-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/compute_within_aggregate-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/compute_within_aggregate-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/compute_within_aggregate-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/compute_within_aggregate-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/multiple_measure_aggregate-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/multiple_measure_aggregate-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/multiple_measure_aggregate-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/multiple_measure_aggregate-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/single_measure_aggregate-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/single_measure_aggregate-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DataFusionProducer/single_measure_aggregate-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DataFusionProducer/single_measure_aggregate-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_in_subquery-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_in_subquery-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_in_subquery-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_in_subquery-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_computation-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_computation-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_computation-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_computation-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_group_by-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_group_by-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_cube-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_group_by_cube-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_cube-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_group_by_cube-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_rollup-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_group_by_rollup-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_group_by_rollup-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_group_by_rollup-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_grouping_set-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_grouping_set-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/aggregate_with_grouping_set-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/aggregate_with_grouping_set-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/computation_between_aggregates-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/computation_between_aggregates-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/computation_between_aggregates-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/computation_between_aggregates-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/compute_within_aggregate-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/compute_within_aggregate-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/compute_within_aggregate-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/compute_within_aggregate-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/multiple_measure_aggregate-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/multiple_measure_aggregate-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/multiple_measure_aggregate-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/multiple_measure_aggregate-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/single_measure_aggregate-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/single_measure_aggregate-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/DuckDBProducer/single_measure_aggregate-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/DuckDBProducer/single_measure_aggregate-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_in_subquery-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_in_subquery-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_in_subquery-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_in_subquery-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_in_subquery_plan.json b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_in_subquery_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_in_subquery_plan.json rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_in_subquery_plan.json diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_computation-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_computation-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_computation-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_computation-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_computation_plan.json b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_computation_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_computation_plan.json rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_computation_plan.json diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_group_by-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_group_by-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_cube-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_group_by_cube-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_cube-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_group_by_cube-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_plan.json b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_group_by_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_plan.json rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_group_by_plan.json diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_rollup-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_group_by_rollup-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_group_by_rollup-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_group_by_rollup-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_grouping_set-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_grouping_set-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_grouping_set-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_grouping_set-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_grouping_set_plan.json b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_grouping_set_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/aggregate_with_grouping_set_plan.json rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/aggregate_with_grouping_set_plan.json diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/computation_between_aggregates-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/computation_between_aggregates-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/computation_between_aggregates-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/computation_between_aggregates-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/computation_between_aggregates_plan.json b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/computation_between_aggregates_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/computation_between_aggregates_plan.json rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/computation_between_aggregates_plan.json diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/compute_within_aggregate-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/compute_within_aggregate-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/compute_within_aggregate-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/compute_within_aggregate-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/compute_within_aggregate_plan.json b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/compute_within_aggregate_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/compute_within_aggregate_plan.json rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/compute_within_aggregate_plan.json diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/multiple_measure_aggregate-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/multiple_measure_aggregate-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/multiple_measure_aggregate-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/multiple_measure_aggregate-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/multiple_measure_aggregate_plan.json b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/multiple_measure_aggregate_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/multiple_measure_aggregate_plan.json rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/multiple_measure_aggregate_plan.json diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/single_measure_aggregate-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/single_measure_aggregate-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/single_measure_aggregate-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/single_measure_aggregate-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/single_measure_aggregate_plan.json b/substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/single_measure_aggregate_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/IsthmusProducer/single_measure_aggregate_plan.json rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/IsthmusProducer/single_measure_aggregate_plan.json diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_in_subquery_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_in_subquery_result.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_computation_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_computation_result.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_cube_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_cube_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_cube_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_cube_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_cube_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_cube_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_cube_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_cube_result.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_result.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_rollup_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_rollup_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_rollup_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_rollup_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_rollup_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_rollup_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_group_by_rollup_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_group_by_rollup_result.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/aggregate_with_grouping_set_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/aggregate_with_grouping_set_result.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/computation_between_aggregates_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/computation_between_aggregates_result.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/compute_within_aggregate-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/compute_within_aggregate-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/compute_within_aggregate-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/compute_within_aggregate-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/compute_within_aggregate-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/compute_within_aggregate-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/compute_within_aggregate-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/compute_within_aggregate-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/compute_within_aggregate_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/compute_within_aggregate_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/compute_within_aggregate_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/compute_within_aggregate_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/compute_within_aggregate_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/compute_within_aggregate_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/compute_within_aggregate_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/compute_within_aggregate_result.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/multiple_measure_aggregate_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/multiple_measure_aggregate_result.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate_outcome.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate_outcome.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate_result.txt b/substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/aggregate_relation_snapshots/relation_test_results/single_measure_aggregate_result.txt rename to substrait_consumer/tests/functional/relations/aggregate_snapshots/relation_test_results/single_measure_aggregate_result.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/alter_column-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/alter_column-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/alter_column-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/alter_column-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/alter_table-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/alter_table-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/alter_table-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/alter_table-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/create_or_replace_view-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/create_or_replace_view-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/create_or_replace_view-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/create_or_replace_view-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/create_table-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/create_table-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/create_table-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/create_table-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/create_view-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/create_view-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/create_view-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/create_view-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/drop_column-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/drop_column-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/drop_column-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/drop_column-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/drop_table-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/drop_table-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DataFusionProducer/drop_table-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DataFusionProducer/drop_table-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/alter_column-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/alter_column-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/alter_column-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/alter_column-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/alter_table-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/alter_table-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/alter_table-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/alter_table-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/create_or_replace_view-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/create_or_replace_view-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/create_or_replace_view-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/create_or_replace_view-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/create_table-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/create_table-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/create_table-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/create_table-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/create_view-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/create_view-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/create_view-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/create_view-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/drop_column-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/drop_column-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/drop_column-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/drop_column-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/drop_table-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/drop_table-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/DuckDBProducer/drop_table-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/DuckDBProducer/drop_table-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/alter_column-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/alter_column-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/alter_column-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/alter_column-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/alter_table-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/alter_table-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/alter_table-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/alter_table-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/create_or_replace_view-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/create_or_replace_view-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/create_or_replace_view-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/create_or_replace_view-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/create_table-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/create_table-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/create_table-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/create_table-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/create_view-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/create_view-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/create_view-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/create_view-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/drop_column-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/drop_column-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/drop_column-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/drop_column-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/drop_table-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/drop_table-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/ddl_relation_snapshots/IsthmusProducer/drop_table-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/ddl_snapshots/IsthmusProducer/drop_table-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DataFusionProducer/fetch-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/DataFusionProducer/fetch-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DataFusionProducer/fetch-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/DataFusionProducer/fetch-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DataFusionProducer/fetch_with_offset-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/DataFusionProducer/fetch_with_offset-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DataFusionProducer/fetch_with_offset-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/DataFusionProducer/fetch_with_offset-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/DuckDBProducer/fetch-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/DuckDBProducer/fetch-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_with_offset-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/DuckDBProducer/fetch_with_offset-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/DuckDBProducer/fetch_with_offset-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/DuckDBProducer/fetch_with_offset-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/IsthmusProducer/fetch-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/IsthmusProducer/fetch-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/IsthmusProducer/fetch-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/IsthmusProducer/fetch-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/IsthmusProducer/fetch_plan.json b/substrait_consumer/tests/functional/relations/fetch_snapshots/IsthmusProducer/fetch_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/IsthmusProducer/fetch_plan.json rename to substrait_consumer/tests/functional/relations/fetch_snapshots/IsthmusProducer/fetch_plan.json diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/IsthmusProducer/fetch_with_offset-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/IsthmusProducer/fetch_with_offset-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/IsthmusProducer/fetch_with_offset-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/IsthmusProducer/fetch_with_offset-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/IsthmusProducer/fetch_with_offset_plan.json b/substrait_consumer/tests/functional/relations/fetch_snapshots/IsthmusProducer/fetch_with_offset_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/IsthmusProducer/fetch_with_offset_plan.json rename to substrait_consumer/tests/functional/relations/fetch_snapshots/IsthmusProducer/fetch_with_offset_plan.json diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_result.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_result.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_result.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset_outcome.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset_outcome.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset_result.txt b/substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/fetch_relation_snapshots/relation_test_results/fetch_with_offset_result.txt rename to substrait_consumer/tests/functional/relations/fetch_snapshots/relation_test_results/fetch_with_offset_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/having-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/having-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/having-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/having-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_and-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_and-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_and-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_and-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_between-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_between-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_between-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_between-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_equal_multi_col-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_equal_multi_col-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_equal_multi_col-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_equal_multi_col-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_gt_multi_col-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_gt_multi_col-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_gt_multi_col-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_gt_multi_col-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_gte_multi_col-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_gte_multi_col-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_gte_multi_col-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_gte_multi_col-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_in-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_in-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_in-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_in-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_like-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_like-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_like-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_like-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_lt_multi_col-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_lt_multi_col-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_lt_multi_col-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_lt_multi_col-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_lte_multi_col-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_lte_multi_col-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_lte_multi_col-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_lte_multi_col-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_not_equal_multi_col-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_not_equal_multi_col-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_not_equal_multi_col-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_not_equal_multi_col-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_or-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_or-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DataFusionProducer/where_or-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DataFusionProducer/where_or-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/having-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/having-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/having-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/having-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_and-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_and-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_and-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_and-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_between-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_between-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_between-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_between-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_equal_multi_col-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_equal_multi_col-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_equal_multi_col-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_equal_multi_col-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gt_multi_col-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_gt_multi_col-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gt_multi_col-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_gt_multi_col-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gte_multi_col-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_gte_multi_col-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_gte_multi_col-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_gte_multi_col-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_in-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_in-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_in-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_in-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_like-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_like-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_like-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_like-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lt_multi_col-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_lt_multi_col-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lt_multi_col-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_lt_multi_col-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lte_multi_col-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_lte_multi_col-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_lte_multi_col-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_lte_multi_col-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_not_equal_multi_col-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_not_equal_multi_col-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_not_equal_multi_col-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_not_equal_multi_col-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_or-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_or-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/DuckDBProducer/where_or-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/DuckDBProducer/where_or-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/having-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/having-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/having-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/having-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/having_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/having_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/having_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/having_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_and-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_and-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_and-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_and-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_and_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_and_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_and_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_and_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_between-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_between-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_between-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_between-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_between_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_between_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_between_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_between_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_equal_multi_col-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_equal_multi_col-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_equal_multi_col-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_equal_multi_col-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_equal_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_equal_multi_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_equal_multi_col_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_equal_multi_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_gt_multi_col-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_gt_multi_col-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_gt_multi_col-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_gt_multi_col-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_gt_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_gt_multi_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_gt_multi_col_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_gt_multi_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_gte_multi_col-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_gte_multi_col-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_gte_multi_col-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_gte_multi_col-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_gte_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_gte_multi_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_gte_multi_col_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_gte_multi_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_in-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_in-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_in-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_in-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_in_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_in_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_in_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_in_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_like-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_like-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_like-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_like-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_like_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_like_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_like_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_like_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_lt_multi_col-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_lt_multi_col-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_lt_multi_col-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_lt_multi_col-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_lt_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_lt_multi_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_lt_multi_col_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_lt_multi_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_lte_multi_col-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_lte_multi_col-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_lte_multi_col-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_lte_multi_col-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_lte_multi_col_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_lte_multi_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_lte_multi_col_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_lte_multi_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_not_equal_multi_col-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_not_equal_multi_col-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_not_equal_multi_col-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_not_equal_multi_col-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_or-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_or-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_or-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_or-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_or_plan.json b/substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_or_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/IsthmusProducer/where_or_plan.json rename to substrait_consumer/tests/functional/relations/filter_snapshots/IsthmusProducer/where_or_plan.json diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/having_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/having_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_and_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_and_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_between_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_between_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_equal_multi_col_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_equal_multi_col_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gt_multi_col_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gt_multi_col_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_gte_multi_col_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_gte_multi_col_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_in_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_in_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_like_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_like_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lt_multi_col_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lt_multi_col_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_lte_multi_col_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_lte_multi_col_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_not_equal_multi_col_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_not_equal_multi_col_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_not_equal_multi_col_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_not_equal_multi_col_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_not_equal_multi_col_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_not_equal_multi_col_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_not_equal_multi_col_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_not_equal_multi_col_result.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or_outcome.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or_outcome.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or_result.txt b/substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/filter_relation_snapshots/relation_test_results/where_or_result.txt rename to substrait_consumer/tests/functional/relations/filter_snapshots/relation_test_results/where_or_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/cross_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/cross_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/cross_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/cross_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/full_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/full_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/full_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/full_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/inner_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/inner_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/inner_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/inner_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_anti_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_anti_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_anti_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_anti_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_mark_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_mark_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_mark_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_mark_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_semi_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_semi_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_semi_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_semi_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_single_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_single_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/left_single_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/left_single_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_anti_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_anti_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_anti_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_anti_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_mark_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_mark_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_mark_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_mark_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_semi_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_semi_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_semi_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_semi_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_single_join-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_single_join-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DataFusionProducer/right_single_join-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DataFusionProducer/right_single_join-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/cross_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/cross_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/cross_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/cross_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/full_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/full_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/full_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/full_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/inner_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/inner_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/inner_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/inner_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_anti_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_anti_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_anti_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_anti_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_mark_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_mark_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_mark_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_mark_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_semi_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_semi_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_semi_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_semi_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_single_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_single_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/left_single_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/left_single_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_anti_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_anti_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_anti_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_anti_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_mark_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_mark_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_mark_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_mark_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_semi_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_semi_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_semi_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_semi_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_single_join-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_single_join-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/DuckDBProducer/right_single_join-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/DuckDBProducer/right_single_join-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/cross_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/cross_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/cross_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/cross_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/cross_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/cross_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/cross_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/cross_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/full_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/full_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/full_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/full_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/full_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/full_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/full_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/full_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/inner_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/inner_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/inner_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/inner_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/inner_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/inner_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/inner_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/inner_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_anti_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_anti_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_anti_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_anti_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_anti_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_anti_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_anti_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_anti_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_mark_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_mark_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_mark_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_mark_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_semi_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_semi_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_semi_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_semi_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_semi_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_semi_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_semi_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_semi_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_single_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_single_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_single_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_single_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_single_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_single_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/left_single_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/left_single_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_anti_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_anti_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_anti_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_anti_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_anti_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_anti_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_anti_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_anti_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_mark_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_mark_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_mark_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_mark_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_semi_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_semi_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_semi_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_semi_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_semi_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_semi_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_semi_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_semi_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_single_join-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_single_join-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_single_join-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_single_join-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_single_join_plan.json b/substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_single_join_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/IsthmusProducer/right_single_join_plan.json rename to substrait_consumer/tests/functional/relations/join_snapshots/IsthmusProducer/right_single_join_plan.json diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/cross_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/cross_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/full_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/full_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/inner_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/inner_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_anti_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_anti_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_mark_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_mark_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_mark_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_mark_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_mark_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_mark_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_mark_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_mark_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_semi_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_semi_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/left_single_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/left_single_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_anti_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_anti_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_mark_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_mark_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_mark_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_mark_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_mark_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_mark_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_mark_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_mark_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_semi_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_semi_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join_outcome.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join_outcome.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join_result.txt b/substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/join_relation_snapshots/relation_test_results/right_single_join_result.txt rename to substrait_consumer/tests/functional/relations/join_snapshots/relation_test_results/right_single_join_result.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/count_distinct_in_project-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/count_distinct_in_project-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/count_distinct_in_project-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/count_distinct_in_project-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/distinct_in_project-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/distinct_in_project-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/distinct_in_project-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/distinct_in_project-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/extended_project-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/extended_project-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/extended_project-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/extended_project-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_all_col-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_all_col-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_all_col-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_all_col-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_all_col_plan.json b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_all_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_all_col_plan.json rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_all_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_multi_col-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_multi_col-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_multi_col-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_multi_col-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_multi_col_plan.json b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_multi_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_multi_col_plan.json rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_multi_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_single_col-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_single_col-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_single_col-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_single_col-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_single_col_plan.json b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_single_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/project_single_col_plan.json rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/project_single_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/subquery_in_project-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/subquery_in_project-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DataFusionProducer/subquery_in_project-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DataFusionProducer/subquery_in_project-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/count_distinct_in_project-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/count_distinct_in_project-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/count_distinct_in_project-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/count_distinct_in_project-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/distinct_in_project-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/distinct_in_project-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/distinct_in_project-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/distinct_in_project-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/extended_project-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/extended_project-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/extended_project-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/extended_project-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_all_col-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/project_all_col-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_all_col-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/project_all_col-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_multi_col-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/project_multi_col-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_multi_col-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/project_multi_col-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_single_col-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/project_single_col-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/project_single_col-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/project_single_col-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/subquery_in_project-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/subquery_in_project-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/DuckDBProducer/subquery_in_project-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/DuckDBProducer/subquery_in_project-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/count_distinct_in_project-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/count_distinct_in_project-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/count_distinct_in_project-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/count_distinct_in_project-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/count_distinct_in_project_plan.json b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/count_distinct_in_project_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/count_distinct_in_project_plan.json rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/count_distinct_in_project_plan.json diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/distinct_in_project-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/distinct_in_project-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/distinct_in_project-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/distinct_in_project-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/distinct_in_project_plan.json b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/distinct_in_project_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/distinct_in_project_plan.json rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/distinct_in_project_plan.json diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/extended_project-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/extended_project-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/extended_project-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/extended_project-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/extended_project_plan.json b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/extended_project_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/extended_project_plan.json rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/extended_project_plan.json diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_all_col-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_all_col-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_all_col-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_all_col-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_all_col_plan.json b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_all_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_all_col_plan.json rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_all_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_multi_col-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_multi_col-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_multi_col-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_multi_col-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_multi_col_plan.json b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_multi_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_multi_col_plan.json rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_multi_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_single_col-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_single_col-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_single_col-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_single_col-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_single_col_plan.json b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_single_col_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/project_single_col_plan.json rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/project_single_col_plan.json diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/subquery_in_project-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/subquery_in_project-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/IsthmusProducer/subquery_in_project-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/IsthmusProducer/subquery_in_project-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project_result.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/count_distinct_in_project_result.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/count_distinct_in_project_result.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project_result.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/distinct_in_project_result.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/distinct_in_project_result.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project_result.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/extended_project_result.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/extended_project_result.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-datafusion-acero_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-datafusion-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-datafusion-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-datafusion-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-datafusion-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-datafusion-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-datafusion-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-datafusion-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-datafusion-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-datafusion-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-datafusion-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-datafusion-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col_result.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_all_col_result.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_all_col_result.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-datafusion-acero_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-datafusion-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-datafusion-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-datafusion-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-datafusion-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-datafusion-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-datafusion-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-datafusion-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-datafusion-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-datafusion-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-datafusion-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-datafusion-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col_result.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_multi_col_result.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_multi_col_result.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-datafusion-acero_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-datafusion-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-datafusion-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-datafusion-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-datafusion-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-datafusion-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-datafusion-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-datafusion-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-datafusion-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-datafusion-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-datafusion-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-datafusion-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col_result.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/project_single_col_result.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/project_single_col_result.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/subquery_in_project_outcome.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/subquery_in_project_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/subquery_in_project_outcome.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/subquery_in_project_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/subquery_in_project_result.txt b/substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/subquery_in_project_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/project_relation_snapshots/relation_test_results/subquery_in_project_result.txt rename to substrait_consumer/tests/functional/relations/project_snapshots/relation_test_results/subquery_in_project_result.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/DataFusionProducer/datafusion_read_virtual_table-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/DataFusionProducer/datafusion_read_virtual_table-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/DataFusionProducer/datafusion_read_virtual_table-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/DataFusionProducer/datafusion_read_virtual_table-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/DataFusionProducer/read_named_table-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/DataFusionProducer/read_named_table-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/DataFusionProducer/read_named_table-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/DataFusionProducer/read_named_table-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/duckdb_read_local_file-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/DuckDBProducer/duckdb_read_local_file-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/duckdb_read_local_file-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/DuckDBProducer/duckdb_read_local_file-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/duckdb_read_virtual_table-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/DuckDBProducer/duckdb_read_virtual_table-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/duckdb_read_virtual_table-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/DuckDBProducer/duckdb_read_virtual_table-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/read_named_table-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/DuckDBProducer/read_named_table-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/DuckDBProducer/read_named_table-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/DuckDBProducer/read_named_table-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/IsthmusProducer/isthmus_read_virtual_table-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/IsthmusProducer/isthmus_read_virtual_table-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/IsthmusProducer/isthmus_read_virtual_table-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/IsthmusProducer/isthmus_read_virtual_table-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/IsthmusProducer/isthmus_read_virtual_table_plan.json b/substrait_consumer/tests/functional/relations/read_snapshots/IsthmusProducer/isthmus_read_virtual_table_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/IsthmusProducer/isthmus_read_virtual_table_plan.json rename to substrait_consumer/tests/functional/relations/read_snapshots/IsthmusProducer/isthmus_read_virtual_table_plan.json diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/IsthmusProducer/read_named_table-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/IsthmusProducer/read_named_table-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/IsthmusProducer/read_named_table-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/IsthmusProducer/read_named_table-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/IsthmusProducer/read_named_table_plan.json b/substrait_consumer/tests/functional/relations/read_snapshots/IsthmusProducer/read_named_table_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/IsthmusProducer/read_named_table_plan.json rename to substrait_consumer/tests/functional/relations/read_snapshots/IsthmusProducer/read_named_table_plan.json diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/datafusion_read_virtual_table_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/datafusion_read_virtual_table_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/datafusion_read_virtual_table_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/datafusion_read_virtual_table_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/duckdb_read_local_file_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/duckdb_read_local_file_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/duckdb_read_local_file_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/duckdb_read_local_file_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/duckdb_read_local_file_result.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/duckdb_read_local_file_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/duckdb_read_local_file_result.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/duckdb_read_local_file_result.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/duckdb_read_virtual_table_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/duckdb_read_virtual_table_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/duckdb_read_virtual_table_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/duckdb_read_virtual_table_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/duckdb_read_virtual_table_result.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/duckdb_read_virtual_table_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/duckdb_read_virtual_table_result.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/duckdb_read_virtual_table_result.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table_result.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/isthmus_read_virtual_table_result.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/isthmus_read_virtual_table_result.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table_outcome.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table_outcome.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table_result.txt b/substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/read_relation_snapshots/relation_test_results/read_named_table_result.txt rename to substrait_consumer/tests/functional/relations/read_snapshots/relation_test_results/read_named_table_result.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DataFusionProducer/except-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/DataFusionProducer/except-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/DataFusionProducer/except-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/DataFusionProducer/except-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DataFusionProducer/intersect-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/DataFusionProducer/intersect-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/DataFusionProducer/intersect-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/DataFusionProducer/intersect-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DataFusionProducer/union_all-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/DataFusionProducer/union_all-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/DataFusionProducer/union_all-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/DataFusionProducer/union_all-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DataFusionProducer/union_distinct-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/DataFusionProducer/union_distinct-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/DataFusionProducer/union_distinct-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/DataFusionProducer/union_distinct-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/except-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/DuckDBProducer/except-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/except-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/DuckDBProducer/except-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/intersect-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/DuckDBProducer/intersect-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/intersect-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/DuckDBProducer/intersect-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_all-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/DuckDBProducer/union_all-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_all-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/DuckDBProducer/union_all-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_distinct-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/DuckDBProducer/union_distinct-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/DuckDBProducer/union_distinct-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/DuckDBProducer/union_distinct-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/except-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/except-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/except-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/except-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/except_plan.json b/substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/except_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/except_plan.json rename to substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/except_plan.json diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/intersect-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/intersect-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/intersect-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/intersect-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/intersect_plan.json b/substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/intersect_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/intersect_plan.json rename to substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/intersect_plan.json diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/union_all-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/union_all-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/union_all-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/union_all-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/union_all_plan.json b/substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/union_all_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/union_all_plan.json rename to substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/union_all_plan.json diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/union_distinct-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/union_distinct-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/union_distinct-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/union_distinct-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/union_distinct_plan.json b/substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/union_distinct_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/IsthmusProducer/union_distinct_plan.json rename to substrait_consumer/tests/functional/relations/set_snapshots/IsthmusProducer/union_distinct_plan.json diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except_result.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/except_result.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/except_result.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect_result.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/intersect_result.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/intersect_result.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all_result.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_all_result.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_all_result.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct_outcome.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct_outcome.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct_result.txt b/substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/set_relation_snapshots/relation_test_results/union_distinct_result.txt rename to substrait_consumer/tests/functional/relations/set_snapshots/relation_test_results/union_distinct_result.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_asc-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_asc-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_asc-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_asc-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_asc_desc-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_asc_desc-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_asc_desc-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_asc_desc-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_asc_desc_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_asc_desc_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_asc_desc_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_asc_desc_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_asc_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_asc_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_asc_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_asc_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_desc-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_desc-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_desc-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_desc-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_desc_asc-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_desc_asc-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_desc_asc-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_desc_asc-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_desc_asc_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_desc_asc_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/multi_col_desc_asc_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/multi_col_desc_asc_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/order_by_col_number-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/order_by_col_number-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/order_by_col_number-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/order_by_col_number-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/order_by_col_number_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/order_by_col_number_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/order_by_col_number_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/order_by_col_number_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/single_col_asc-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/single_col_asc-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/single_col_asc-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/single_col_asc-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/single_col_default_sort-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/single_col_default_sort-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/single_col_default_sort-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/single_col_default_sort-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/single_col_desc-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/single_col_desc-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DataFusionProducer/single_col_desc-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DataFusionProducer/single_col_desc-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/multi_col_asc-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/multi_col_asc-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_desc-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/multi_col_asc_desc-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_asc_desc-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/multi_col_asc_desc-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/multi_col_desc-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/multi_col_desc-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_asc-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/multi_col_desc_asc-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/multi_col_desc_asc-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/multi_col_desc_asc-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/order_by_col_number-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/order_by_col_number-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/order_by_col_number-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/order_by_col_number-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_asc-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/single_col_asc-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_asc-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/single_col_asc-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_default_sort-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/single_col_default_sort-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_default_sort-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/single_col_default_sort-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_desc-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/single_col_desc-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/DuckDBProducer/single_col_desc-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/DuckDBProducer/single_col_desc-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_asc-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_asc-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_asc-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_asc-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_asc_desc-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_asc_desc-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_asc_desc-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_asc_desc-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_asc_desc_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_asc_desc_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_asc_desc_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_asc_desc_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_asc_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_asc_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_asc_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_asc_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_desc-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_desc-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_desc-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_desc-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_desc_asc-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_desc_asc-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_desc_asc-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_desc_asc-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_desc_asc_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_desc_asc_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_desc_asc_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_desc_asc_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_desc_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_desc_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/multi_col_desc_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/multi_col_desc_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/order_by_col_number-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/order_by_col_number-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/order_by_col_number-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/order_by_col_number-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/order_by_col_number_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/order_by_col_number_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/order_by_col_number_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/order_by_col_number_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_asc-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_asc-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_asc-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_asc-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_asc_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_asc_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_asc_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_asc_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_default_sort-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_default_sort-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_default_sort-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_default_sort-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_default_sort_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_default_sort_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_default_sort_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_default_sort_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_desc-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_desc-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_desc-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_desc-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_desc_plan.json b/substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_desc_plan.json similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/IsthmusProducer/single_col_desc_plan.json rename to substrait_consumer/tests/functional/relations/sort_snapshots/IsthmusProducer/single_col_desc_plan.json diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-datafusion-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-datafusion-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-datafusion-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-datafusion-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-datafusion-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-datafusion-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-datafusion-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-datafusion-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-datafusion-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-datafusion-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-datafusion-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-datafusion-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-datafusion-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-datafusion-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-datafusion-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-datafusion-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-datafusion-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-datafusion-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-datafusion-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-datafusion-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-datafusion-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-datafusion-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-datafusion-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-datafusion-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc_result.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_desc_result.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_desc_result.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_result.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_asc_result.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_asc_result.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-datafusion-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-datafusion-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-datafusion-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-datafusion-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-datafusion-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-datafusion-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-datafusion-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-datafusion-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-datafusion-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-datafusion-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-datafusion-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-datafusion-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc_result.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_asc_result.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_asc_result.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_result.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/multi_col_desc_result.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/multi_col_desc_result.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-datafusion-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-datafusion-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-datafusion-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-datafusion-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-datafusion-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-datafusion-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-datafusion-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-datafusion-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-datafusion-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-datafusion-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-datafusion-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-datafusion-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number_result.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/order_by_col_number_result.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/order_by_col_number_result.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc_result.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_asc_result.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_asc_result.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort_result.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_default_sort_result.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_default_sort_result.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc-isthmus-acero_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc-isthmus-acero_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc-isthmus-acero_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc-isthmus-acero_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc-isthmus-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc-isthmus-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc-isthmus-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc-isthmus-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc-isthmus-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc-isthmus-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc-isthmus-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc-isthmus-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc_outcome.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc_outcome.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc_result.txt b/substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc_result.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/sort_relation_snapshots/relation_test_results/single_col_desc_result.txt rename to substrait_consumer/tests/functional/relations/sort_snapshots/relation_test_results/single_col_desc_result.txt diff --git a/substrait_consumer/tests/functional/relations/write_relation_snapshots/DataFusionProducer/delete-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/write_snapshots/DataFusionProducer/delete-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/write_relation_snapshots/DataFusionProducer/delete-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/write_snapshots/DataFusionProducer/delete-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/write_relation_snapshots/DataFusionProducer/insert-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/write_snapshots/DataFusionProducer/insert-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/write_relation_snapshots/DataFusionProducer/insert-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/write_snapshots/DataFusionProducer/insert-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/write_relation_snapshots/DataFusionProducer/update-datafusion_outcome.txt b/substrait_consumer/tests/functional/relations/write_snapshots/DataFusionProducer/update-datafusion_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/write_relation_snapshots/DataFusionProducer/update-datafusion_outcome.txt rename to substrait_consumer/tests/functional/relations/write_snapshots/DataFusionProducer/update-datafusion_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/write_relation_snapshots/DuckDBProducer/delete-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/write_snapshots/DuckDBProducer/delete-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/write_relation_snapshots/DuckDBProducer/delete-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/write_snapshots/DuckDBProducer/delete-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/write_relation_snapshots/DuckDBProducer/insert-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/write_snapshots/DuckDBProducer/insert-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/write_relation_snapshots/DuckDBProducer/insert-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/write_snapshots/DuckDBProducer/insert-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/write_relation_snapshots/DuckDBProducer/update-duckdb_outcome.txt b/substrait_consumer/tests/functional/relations/write_snapshots/DuckDBProducer/update-duckdb_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/write_relation_snapshots/DuckDBProducer/update-duckdb_outcome.txt rename to substrait_consumer/tests/functional/relations/write_snapshots/DuckDBProducer/update-duckdb_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/write_relation_snapshots/IsthmusProducer/delete-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/write_snapshots/IsthmusProducer/delete-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/write_relation_snapshots/IsthmusProducer/delete-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/write_snapshots/IsthmusProducer/delete-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/write_relation_snapshots/IsthmusProducer/insert-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/write_snapshots/IsthmusProducer/insert-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/write_relation_snapshots/IsthmusProducer/insert-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/write_snapshots/IsthmusProducer/insert-isthmus_outcome.txt diff --git a/substrait_consumer/tests/functional/relations/write_relation_snapshots/IsthmusProducer/update-isthmus_outcome.txt b/substrait_consumer/tests/functional/relations/write_snapshots/IsthmusProducer/update-isthmus_outcome.txt similarity index 100% rename from substrait_consumer/tests/functional/relations/write_relation_snapshots/IsthmusProducer/update-isthmus_outcome.txt rename to substrait_consumer/tests/functional/relations/write_snapshots/IsthmusProducer/update-isthmus_outcome.txt