diff --git a/testdata/workloads/functional-query/functional-query_core.csv b/testdata/workloads/functional-query/functional-query_core.csv
index 375e9a78a..da4a8795f 100644
--- a/testdata/workloads/functional-query/functional-query_core.csv
+++ b/testdata/workloads/functional-query/functional-query_core.csv
@@ -1,4 +1,4 @@
 # Manually created file.
 file_format:text, dataset:functional, compression_codec:none, compression_type:none
 file_format:seq, dataset:functional, compression_codec:none, compression_type:none
-file_format:trevni, dataset:functional, compression_codec:none, compression_type:none
+file_format:seq, dataset:functional, compression_codec:snap, compression_type:block
diff --git a/testdata/workloads/functional-query/functional-query_dimensions.csv b/testdata/workloads/functional-query/functional-query_dimensions.csv
index 2402858dc..09653036a 100644
--- a/testdata/workloads/functional-query/functional-query_dimensions.csv
+++ b/testdata/workloads/functional-query/functional-query_dimensions.csv
@@ -1,4 +1,4 @@
-file_format: text,seq,rc,trevni
+file_format: text,seq,rc
 dataset: functional
 compression_codec: none,def,gzip,bzip,snap
 compression_type: none,block,record
diff --git a/testdata/workloads/functional-query/functional-query_exhaustive.csv b/testdata/workloads/functional-query/functional-query_exhaustive.csv
index b830e2909..042307082 100644
--- a/testdata/workloads/functional-query/functional-query_exhaustive.csv
+++ b/testdata/workloads/functional-query/functional-query_exhaustive.csv
@@ -14,6 +14,3 @@ file_format: rc, dataset: functional, compression_codec: def, compression_type:
 file_format: rc, dataset: functional, compression_codec: gzip, compression_type: block
 file_format: rc, dataset: functional, compression_codec: bzip, compression_type: block
 file_format: rc, dataset: functional, compression_codec: snap, compression_type: block
-file_format: trevni, dataset: functional, compression_codec: none, compression_type: none
-file_format: trevni, dataset: functional, compression_codec: def, compression_type: block
-file_format: trevni, dataset: functional, compression_codec: snap, compression_type: block
diff --git a/testdata/workloads/functional-query/functional-query_pairwise.csv b/testdata/workloads/functional-query/functional-query_pairwise.csv
index c7c6a4b52..05440aa18 100644
--- a/testdata/workloads/functional-query/functional-query_pairwise.csv
+++ b/testdata/workloads/functional-query/functional-query_pairwise.csv
@@ -2,7 +2,5 @@
 file_format: text, dataset: functional, compression_codec: none, compression_type: none
 file_format: seq, dataset: functional, compression_codec: def, compression_type: block
 file_format: rc, dataset: functional, compression_codec: gzip, compression_type: block
-file_format: trevni, dataset: functional, compression_codec: snap, compression_type: block
-file_format: trevni, dataset: functional, compression_codec: def, compression_type: block
 file_format: rc, dataset: functional, compression_codec: bzip, compression_type: block
-file_format: seq, dataset: functional, compression_codec: bzip, compression_type: record
+file_format: seq, dataset: functional, compression_codec: snap, compression_type: record
diff --git a/testdata/workloads/hive-benchmark/hive-benchmark_dimensions.csv b/testdata/workloads/hive-benchmark/hive-benchmark_dimensions.csv
index c4ce8aacf..2284fe9e8 100644
--- a/testdata/workloads/hive-benchmark/hive-benchmark_dimensions.csv
+++ b/testdata/workloads/hive-benchmark/hive-benchmark_dimensions.csv
@@ -1,4 +1,4 @@
-file_format: text,seq,rc,trevni
+file_format: text,seq,rc
 dataset: hive-benchmark
 compression_codec: none,def,gzip,bzip,snap
 compression_type: none,block,record
diff --git a/testdata/workloads/hive-benchmark/hive-benchmark_exhaustive.csv b/testdata/workloads/hive-benchmark/hive-benchmark_exhaustive.csv
index e845253fc..5d81e1cf6 100644
--- a/testdata/workloads/hive-benchmark/hive-benchmark_exhaustive.csv
+++ b/testdata/workloads/hive-benchmark/hive-benchmark_exhaustive.csv
@@ -14,6 +14,3 @@ file_format: rc, dataset: hive-benchmark, compression_codec: def, compression_ty
 file_format: rc, dataset: hive-benchmark, compression_codec: gzip, compression_type: block
 file_format: rc, dataset: hive-benchmark, compression_codec: bzip, compression_type: block
 file_format: rc, dataset: hive-benchmark, compression_codec: snap, compression_type: block
-file_format: trevni, dataset: hive-benchmark, compression_codec: none, compression_type: none
-file_format: trevni, dataset: hive-benchmark, compression_codec: def, compression_type: block
-file_format: trevni, dataset: hive-benchmark, compression_codec: snap, compression_type: block
diff --git a/testdata/workloads/hive-benchmark/hive-benchmark_pairwise.csv b/testdata/workloads/hive-benchmark/hive-benchmark_pairwise.csv
index e63f75c89..73c970735 100644
--- a/testdata/workloads/hive-benchmark/hive-benchmark_pairwise.csv
+++ b/testdata/workloads/hive-benchmark/hive-benchmark_pairwise.csv
@@ -2,7 +2,5 @@
 file_format: text, dataset: hive-benchmark, compression_codec: none, compression_type: none
 file_format: seq, dataset: hive-benchmark, compression_codec: def, compression_type: block
 file_format: rc, dataset: hive-benchmark, compression_codec: gzip, compression_type: block
-file_format: trevni, dataset: hive-benchmark, compression_codec: snap, compression_type: block
-file_format: trevni, dataset: hive-benchmark, compression_codec: def, compression_type: block
 file_format: rc, dataset: hive-benchmark, compression_codec: bzip, compression_type: block
-file_format: seq, dataset: hive-benchmark, compression_codec: bzip, compression_type: record
+file_format: seq, dataset: hive-benchmark, compression_codec: snap, compression_type: record
diff --git a/testdata/workloads/tpcds/tpcds_dimensions.csv b/testdata/workloads/tpcds/tpcds_dimensions.csv
index 29c844b57..de786537f 100644
--- a/testdata/workloads/tpcds/tpcds_dimensions.csv
+++ b/testdata/workloads/tpcds/tpcds_dimensions.csv
@@ -1,4 +1,4 @@
-file_format: text,seq,rc,trevni
+file_format: text,seq,rc
 dataset: tpcds
 compression_codec: none,def,gzip,bzip,snap
 compression_type: none,block,record
diff --git a/testdata/workloads/tpcds/tpcds_exhaustive.csv b/testdata/workloads/tpcds/tpcds_exhaustive.csv
index dc31e4232..1511f438d 100644
--- a/testdata/workloads/tpcds/tpcds_exhaustive.csv
+++ b/testdata/workloads/tpcds/tpcds_exhaustive.csv
@@ -14,6 +14,3 @@ file_format: rc, dataset: tpcds, compression_codec: def, compression_type: block
 file_format: rc, dataset: tpcds, compression_codec: gzip, compression_type: block
 file_format: rc, dataset: tpcds, compression_codec: bzip, compression_type: block
 file_format: rc, dataset: tpcds, compression_codec: snap, compression_type: block
-file_format: trevni, dataset: tpcds, compression_codec: none, compression_type: none
-file_format: trevni, dataset: tpcds, compression_codec: def, compression_type: block
-file_format: trevni, dataset: tpcds, compression_codec: snap, compression_type: block
diff --git a/testdata/workloads/tpcds/tpcds_pairwise.csv b/testdata/workloads/tpcds/tpcds_pairwise.csv
index 5325587d8..2acdce84d 100644
--- a/testdata/workloads/tpcds/tpcds_pairwise.csv
+++ b/testdata/workloads/tpcds/tpcds_pairwise.csv
@@ -2,7 +2,5 @@
 file_format: text, dataset: tpcds, compression_codec: none, compression_type: none
 file_format: seq, dataset: tpcds, compression_codec: def, compression_type: block
 file_format: rc, dataset: tpcds, compression_codec: gzip, compression_type: block
-file_format: trevni, dataset: tpcds, compression_codec: snap, compression_type: block
-file_format: trevni, dataset: tpcds, compression_codec: def, compression_type: block
 file_format: rc, dataset: tpcds, compression_codec: bzip, compression_type: block
-file_format: seq, dataset: tpcds, compression_codec: bzip, compression_type: record
+file_format: seq, dataset: tpcds, compression_codec: snap, compression_type: record