diff --git a/substrait_consumer/tests/functional/tpch/q01_snapshots/IsthmusProducer/q01-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q01_snapshots/IsthmusProducer/q01-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q01_snapshots/IsthmusProducer/q01-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_01_plan.json b/substrait_consumer/tests/functional/tpch/q01_snapshots/IsthmusProducer/q01_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_01_plan.json
rename to substrait_consumer/tests/functional/tpch/q01_snapshots/IsthmusProducer/q01_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q02_snapshots/IsthmusProducer/q02-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q02_snapshots/IsthmusProducer/q02-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q02_snapshots/IsthmusProducer/q02-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_02_plan.json b/substrait_consumer/tests/functional/tpch/q02_snapshots/IsthmusProducer/q02_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_02_plan.json
rename to substrait_consumer/tests/functional/tpch/q02_snapshots/IsthmusProducer/q02_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q03_snapshots/IsthmusProducer/q03-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q03_snapshots/IsthmusProducer/q03-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q03_snapshots/IsthmusProducer/q03-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_03_plan.json b/substrait_consumer/tests/functional/tpch/q03_snapshots/IsthmusProducer/q03_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_03_plan.json
rename to substrait_consumer/tests/functional/tpch/q03_snapshots/IsthmusProducer/q03_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q04_snapshots/IsthmusProducer/q04-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q04_snapshots/IsthmusProducer/q04-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q04_snapshots/IsthmusProducer/q04-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_04_plan.json b/substrait_consumer/tests/functional/tpch/q04_snapshots/IsthmusProducer/q04_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_04_plan.json
rename to substrait_consumer/tests/functional/tpch/q04_snapshots/IsthmusProducer/q04_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q05_snapshots/IsthmusProducer/q05-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q05_snapshots/IsthmusProducer/q05-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q05_snapshots/IsthmusProducer/q05-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_05_plan.json b/substrait_consumer/tests/functional/tpch/q05_snapshots/IsthmusProducer/q05_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_05_plan.json
rename to substrait_consumer/tests/functional/tpch/q05_snapshots/IsthmusProducer/q05_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q06_snapshots/IsthmusProducer/q06-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q06_snapshots/IsthmusProducer/q06-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q06_snapshots/IsthmusProducer/q06-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_06_plan.json b/substrait_consumer/tests/functional/tpch/q06_snapshots/IsthmusProducer/q06_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_06_plan.json
rename to substrait_consumer/tests/functional/tpch/q06_snapshots/IsthmusProducer/q06_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q07_snapshots/IsthmusProducer/q07-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q07_snapshots/IsthmusProducer/q07-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q07_snapshots/IsthmusProducer/q07-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_07_plan.json b/substrait_consumer/tests/functional/tpch/q07_snapshots/IsthmusProducer/q07_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_07_plan.json
rename to substrait_consumer/tests/functional/tpch/q07_snapshots/IsthmusProducer/q07_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q08_snapshots/IsthmusProducer/q08-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q08_snapshots/IsthmusProducer/q08-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q08_snapshots/IsthmusProducer/q08-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_08_plan.json b/substrait_consumer/tests/functional/tpch/q08_snapshots/IsthmusProducer/q08_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_08_plan.json
rename to substrait_consumer/tests/functional/tpch/q08_snapshots/IsthmusProducer/q08_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q09_snapshots/IsthmusProducer/q09-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q09_snapshots/IsthmusProducer/q09-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q09_snapshots/IsthmusProducer/q09-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_09_plan.json b/substrait_consumer/tests/functional/tpch/q09_snapshots/IsthmusProducer/q09_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_09_plan.json
rename to substrait_consumer/tests/functional/tpch/q09_snapshots/IsthmusProducer/q09_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q10_snapshots/IsthmusProducer/q10-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q10_snapshots/IsthmusProducer/q10-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q10_snapshots/IsthmusProducer/q10-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_10_plan.json b/substrait_consumer/tests/functional/tpch/q10_snapshots/IsthmusProducer/q10_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_10_plan.json
rename to substrait_consumer/tests/functional/tpch/q10_snapshots/IsthmusProducer/q10_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q11_snapshots/IsthmusProducer/q11-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q11_snapshots/IsthmusProducer/q11-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q11_snapshots/IsthmusProducer/q11-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_11_plan.json b/substrait_consumer/tests/functional/tpch/q11_snapshots/IsthmusProducer/q11_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_11_plan.json
rename to substrait_consumer/tests/functional/tpch/q11_snapshots/IsthmusProducer/q11_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q12_snapshots/IsthmusProducer/q12-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q12_snapshots/IsthmusProducer/q12-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q12_snapshots/IsthmusProducer/q12-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_12_plan.json b/substrait_consumer/tests/functional/tpch/q12_snapshots/IsthmusProducer/q12_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_12_plan.json
rename to substrait_consumer/tests/functional/tpch/q12_snapshots/IsthmusProducer/q12_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q13_snapshots/IsthmusProducer/q13-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q13_snapshots/IsthmusProducer/q13-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q13_snapshots/IsthmusProducer/q13-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_13_plan.json b/substrait_consumer/tests/functional/tpch/q13_snapshots/IsthmusProducer/q13_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_13_plan.json
rename to substrait_consumer/tests/functional/tpch/q13_snapshots/IsthmusProducer/q13_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q14_snapshots/IsthmusProducer/q14-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q14_snapshots/IsthmusProducer/q14-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q14_snapshots/IsthmusProducer/q14-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_14_plan.json b/substrait_consumer/tests/functional/tpch/q14_snapshots/IsthmusProducer/q14_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_14_plan.json
rename to substrait_consumer/tests/functional/tpch/q14_snapshots/IsthmusProducer/q14_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q15_snapshots/IsthmusProducer/q15-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q15_snapshots/IsthmusProducer/q15-isthmus_outcome.txt
new file mode 100644
index 00000000..3f774b33
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q15_snapshots/IsthmusProducer/q15-isthmus_outcome.txt
@@ -0,0 +1 @@
+<java class 'org.apache.calcite.runtime.CalciteContextException'>
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_15_plan.json b/substrait_consumer/tests/functional/tpch/q15_snapshots/IsthmusProducer/q15_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_15_plan.json
rename to substrait_consumer/tests/functional/tpch/q15_snapshots/IsthmusProducer/q15_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q16_snapshots/IsthmusProducer/q16-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q16_snapshots/IsthmusProducer/q16-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q16_snapshots/IsthmusProducer/q16-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_16_plan.json b/substrait_consumer/tests/functional/tpch/q16_snapshots/IsthmusProducer/q16_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_16_plan.json
rename to substrait_consumer/tests/functional/tpch/q16_snapshots/IsthmusProducer/q16_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q17_snapshots/IsthmusProducer/q17-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q17_snapshots/IsthmusProducer/q17-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q17_snapshots/IsthmusProducer/q17-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_17_plan.json b/substrait_consumer/tests/functional/tpch/q17_snapshots/IsthmusProducer/q17_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_17_plan.json
rename to substrait_consumer/tests/functional/tpch/q17_snapshots/IsthmusProducer/q17_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q18_snapshots/IsthmusProducer/q18-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q18_snapshots/IsthmusProducer/q18-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q18_snapshots/IsthmusProducer/q18-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_18_plan.json b/substrait_consumer/tests/functional/tpch/q18_snapshots/IsthmusProducer/q18_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_18_plan.json
rename to substrait_consumer/tests/functional/tpch/q18_snapshots/IsthmusProducer/q18_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q19_snapshots/IsthmusProducer/q19-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q19_snapshots/IsthmusProducer/q19-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q19_snapshots/IsthmusProducer/q19-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_19_plan.json b/substrait_consumer/tests/functional/tpch/q19_snapshots/IsthmusProducer/q19_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_19_plan.json
rename to substrait_consumer/tests/functional/tpch/q19_snapshots/IsthmusProducer/q19_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q20_snapshots/IsthmusProducer/q20-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q20_snapshots/IsthmusProducer/q20-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q20_snapshots/IsthmusProducer/q20-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_20_plan.json b/substrait_consumer/tests/functional/tpch/q20_snapshots/IsthmusProducer/q20_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_20_plan.json
rename to substrait_consumer/tests/functional/tpch/q20_snapshots/IsthmusProducer/q20_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q21_snapshots/IsthmusProducer/q21-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q21_snapshots/IsthmusProducer/q21-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q21_snapshots/IsthmusProducer/q21-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_21_plan.json b/substrait_consumer/tests/functional/tpch/q21_snapshots/IsthmusProducer/q21_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_21_plan.json
rename to substrait_consumer/tests/functional/tpch/q21_snapshots/IsthmusProducer/q21_plan.json
diff --git a/substrait_consumer/tests/functional/tpch/q22_snapshots/IsthmusProducer/q22-isthmus_outcome.txt b/substrait_consumer/tests/functional/tpch/q22_snapshots/IsthmusProducer/q22-isthmus_outcome.txt
new file mode 100644
index 00000000..4791ed55
--- /dev/null
+++ b/substrait_consumer/tests/functional/tpch/q22_snapshots/IsthmusProducer/q22-isthmus_outcome.txt
@@ -0,0 +1 @@
+True
\ No newline at end of file
diff --git a/substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_22_plan.json b/substrait_consumer/tests/functional/tpch/q22_snapshots/IsthmusProducer/q22_plan.json
similarity index 100%
rename from substrait_consumer/tests/integration/queries/tpch_substrait_plans/query_22_plan.json
rename to substrait_consumer/tests/functional/tpch/q22_snapshots/IsthmusProducer/q22_plan.json