diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-CompressionInfo.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-CompressionInfo.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-CompressionInfo.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Data.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Data.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Data.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Data.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Digest.crc32 b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Digest.crc32
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Digest.crc32
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Filter.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Filter.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Filter.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Partitions.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Partitions.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Partitions.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Partitions.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Rows.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Rows.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Rows.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Rows.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Statistics.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-Statistics.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-Statistics.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-TOC.txt b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-1-bti-TOC.txt
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust/da-500-bti-TOC.txt
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-CompressionInfo.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-CompressionInfo.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-CompressionInfo.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Data.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Data.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Data.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Data.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Digest.crc32 b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Digest.crc32
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Digest.crc32
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Filter.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Filter.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Filter.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Partitions.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Partitions.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Partitions.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Partitions.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Rows.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Rows.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Rows.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Rows.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Statistics.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-Statistics.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-Statistics.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-TOC.txt b/test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-1-bti-TOC.txt
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_clust_counter/da-500-bti-TOC.txt
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-CompressionInfo.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-CompressionInfo.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-CompressionInfo.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Data.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Data.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Data.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Data.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Digest.crc32 b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Digest.crc32
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Digest.crc32
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Filter.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Filter.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Filter.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Partitions.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Partitions.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Partitions.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Partitions.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Rows.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Rows.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Rows.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Rows.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Statistics.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-Statistics.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-Statistics.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-TOC.txt b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-1-bti-TOC.txt
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple/da-500-bti-TOC.txt
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-CompressionInfo.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-CompressionInfo.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-CompressionInfo.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Data.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Data.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Data.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Data.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Digest.crc32 b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Digest.crc32
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Digest.crc32
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Filter.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Filter.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Filter.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Partitions.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Partitions.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Partitions.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Partitions.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Rows.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Rows.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Rows.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Rows.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Statistics.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-Statistics.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-Statistics.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-TOC.txt b/test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-1-bti-TOC.txt
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_simple_counter/da-500-bti-TOC.txt
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-CompressionInfo.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-CompressionInfo.db
new file mode 100644
index 0000000000..5a82349dd2
Binary files /dev/null and b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Data.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Data.db
new file mode 100644
index 0000000000..d281b869c6
Binary files /dev/null and b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Data.db differ
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Digest.crc32 b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Digest.crc32
new file mode 100644
index 0000000000..0778d5baa4
--- /dev/null
+++ b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Digest.crc32
@@ -0,0 +1 @@
+798454228
\ No newline at end of file
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Filter.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Filter.db
rename to test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Filter.db
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Partitions.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Partitions.db
new file mode 100644
index 0000000000..b096fdac14
Binary files /dev/null and b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Partitions.db differ
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Rows.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Rows.db
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Statistics.db b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Statistics.db
new file mode 100644
index 0000000000..fdc9bb3bd6
Binary files /dev/null and b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-Statistics.db differ
diff --git a/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-TOC.txt b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-TOC.txt
new file mode 100644
index 0000000000..298910cfdc
--- /dev/null
+++ b/test/data/legacy-sstables/da/legacy_tables/legacy_da_tuple/da-500-bti-TOC.txt
@@ -0,0 +1,8 @@
+Data.db
+Statistics.db
+Digest.crc32
+TOC.txt
+CompressionInfo.db
+Filter.db
+Partitions.db
+Rows.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Data.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Data.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Digest.crc32
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Digest.crc32
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Filter.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Filter.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Filter.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Index.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Index.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Statistics.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Statistics.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Summary.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-Summary.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-Summary.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-1-big-TOC.txt
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust/ma-306-big-TOC.txt
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Data.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Data.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Digest.crc32
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Digest.crc32
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Filter.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Filter.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Filter.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Index.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Index.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Statistics.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Statistics.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Summary.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-Summary.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-Summary.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-1-big-TOC.txt
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_compact/ma-306-big-TOC.txt
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Data.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Data.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Digest.crc32
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Digest.crc32
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Filter.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Filter.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Filter.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Index.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Index.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Statistics.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Statistics.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Summary.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-Summary.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-Summary.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-1-big-TOC.txt
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter/ma-306-big-TOC.txt
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Data.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Data.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Digest.crc32
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Digest.crc32
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Filter.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Filter.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Filter.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Index.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Index.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Statistics.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Statistics.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Summary.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-Summary.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-Summary.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-1-big-TOC.txt
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_clust_counter_compact/ma-306-big-TOC.txt
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Data.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Data.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Digest.crc32
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Digest.crc32
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Filter.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Filter.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Filter.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Index.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Index.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Statistics.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Statistics.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Summary.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-Summary.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-Summary.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-1-big-TOC.txt
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple/ma-306-big-TOC.txt
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Data.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Data.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Digest.crc32
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Digest.crc32
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Filter.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Filter.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Filter.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Index.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Index.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Statistics.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Statistics.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Summary.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-Summary.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-Summary.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-1-big-TOC.txt
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_compact/ma-306-big-TOC.txt
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Data.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Data.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Digest.crc32
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Digest.crc32
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Filter.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Filter.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Filter.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Index.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Index.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Statistics.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Statistics.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Summary.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-Summary.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-Summary.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-1-big-TOC.txt
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter/ma-306-big-TOC.txt
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Data.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Data.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Digest.crc32
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Digest.crc32
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Filter.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Filter.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Filter.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Index.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Index.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Statistics.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Statistics.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Summary.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-Summary.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-Summary.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-1-big-TOC.txt
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_simple_counter_compact/ma-306-big-TOC.txt
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-CompressionInfo.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-CompressionInfo.db
new file mode 100644
index 0000000000..8e08a5dca9
Binary files /dev/null and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Data.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Data.db
new file mode 100644
index 0000000000..38aa353662
Binary files /dev/null and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Data.db differ
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Digest.crc32 b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Digest.crc32
new file mode 100644
index 0000000000..90049599e0
--- /dev/null
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Digest.crc32
@@ -0,0 +1 @@
+2353277624
\ No newline at end of file
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Filter.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Filter.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Filter.db
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Index.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Index.db
new file mode 100644
index 0000000000..0398b1f8a0
Binary files /dev/null and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Index.db differ
diff --git a/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Statistics.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Statistics.db
new file mode 100644
index 0000000000..99471825af
Binary files /dev/null and b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Summary.db b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Summary.db
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-Summary.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-TOC.txt b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-TOC.txt
rename to test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-TOC.txt
index 6ea912e92c..4ab645afba 100644
--- a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-TOC.txt
+++ b/test/data/legacy-sstables/ma/legacy_tables/legacy_ma_tuple/ma-306-big-TOC.txt
@@ -1,8 +1,8 @@
-TOC.txt
-Data.db
-Statistics.db
 Summary.db
-Filter.db
-Digest.crc32
+Data.db
 Index.db
+Statistics.db
+Filter.db
+TOC.txt
 CompressionInfo.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-CompressionInfo.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Data.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Data.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Data.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Digest.crc32 b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Digest.crc32
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Filter.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Filter.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Filter.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Index.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Index.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Index.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Statistics.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-Statistics.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Statistics.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Summary.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Summary.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-Summary.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-TOC.txt b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-1-big-TOC.txt
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust/mb-307-big-TOC.txt
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-CompressionInfo.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Data.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Data.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Data.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Digest.crc32 b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Digest.crc32
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Filter.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Filter.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Filter.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Index.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Index.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Index.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Statistics.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-Statistics.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Statistics.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Summary.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Summary.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-Summary.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-TOC.txt b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-1-big-TOC.txt
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_compact/mb-307-big-TOC.txt
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-CompressionInfo.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Data.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Data.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Data.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Digest.crc32 b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Digest.crc32
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Filter.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Filter.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Filter.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Index.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Index.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Index.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Statistics.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-Statistics.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Statistics.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Summary.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Summary.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-Summary.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-TOC.txt b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-1-big-TOC.txt
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter/mb-307-big-TOC.txt
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-CompressionInfo.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Data.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Data.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Data.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Digest.crc32 b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Digest.crc32
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Filter.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Filter.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Filter.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Index.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Index.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Index.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Statistics.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-Statistics.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Statistics.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Summary.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Summary.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-Summary.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-TOC.txt b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-1-big-TOC.txt
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_clust_counter_compact/mb-307-big-TOC.txt
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-CompressionInfo.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Data.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Data.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Data.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Digest.crc32 b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Digest.crc32
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Filter.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Filter.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Filter.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Index.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Index.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Index.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Statistics.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-Statistics.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Statistics.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Summary.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Summary.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-Summary.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-TOC.txt b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-1-big-TOC.txt
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple/mb-307-big-TOC.txt
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-CompressionInfo.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Data.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Data.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Data.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Digest.crc32 b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Digest.crc32
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Filter.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Filter.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Filter.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Index.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Index.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Index.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Statistics.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-Statistics.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Statistics.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Summary.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Summary.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-Summary.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-TOC.txt b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-1-big-TOC.txt
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_compact/mb-307-big-TOC.txt
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-CompressionInfo.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Data.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Data.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Data.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Digest.crc32 b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Digest.crc32
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Filter.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Filter.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Filter.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Index.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Index.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Index.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Statistics.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-Statistics.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Statistics.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Summary.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Summary.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-Summary.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-TOC.txt b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-1-big-TOC.txt
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter/mb-307-big-TOC.txt
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-CompressionInfo.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Data.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Data.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Data.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Digest.crc32 b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Digest.crc32
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Filter.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Filter.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Filter.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Index.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Index.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Index.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Statistics.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-Statistics.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Statistics.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Summary.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Summary.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-Summary.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-TOC.txt b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-1-big-TOC.txt
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_simple_counter_compact/mb-307-big-TOC.txt
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-CompressionInfo.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-CompressionInfo.db
new file mode 100644
index 0000000000..53c889d0e4
Binary files /dev/null and b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Data.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Data.db
new file mode 100644
index 0000000000..ec7c382817
Binary files /dev/null and b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Data.db differ
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Digest.crc32 b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Digest.crc32
new file mode 100644
index 0000000000..e86fd57a34
--- /dev/null
+++ b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Digest.crc32
@@ -0,0 +1 @@
+768627854
\ No newline at end of file
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Filter.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Filter.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Filter.db
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Index.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Index.db
new file mode 100644
index 0000000000..3e735baf9a
Binary files /dev/null and b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Index.db differ
diff --git a/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Statistics.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Statistics.db
new file mode 100644
index 0000000000..8ebf44bc22
Binary files /dev/null and b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Summary.db b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Summary.db
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-Summary.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-TOC.txt b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-TOC.txt
rename to test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-TOC.txt
index 6ea912e92c..8ea9eedf3b 100644
--- a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-TOC.txt
+++ b/test/data/legacy-sstables/mb/legacy_tables/legacy_mb_tuple/mb-307-big-TOC.txt
@@ -1,8 +1,8 @@
+CompressionInfo.db
+Digest.crc32
+Statistics.db
 TOC.txt
 Data.db
-Statistics.db
-Summary.db
-Filter.db
-Digest.crc32
 Index.db
-CompressionInfo.db
+Filter.db
+Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Data.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Data.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Digest.crc32
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Index.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Index.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-Statistics.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Statistics.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust/mc-3113-big-TOC.txt
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Data.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Data.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Digest.crc32
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Index.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Index.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-Statistics.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Statistics.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_compact/mc-3113-big-TOC.txt
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Data.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Data.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Digest.crc32
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Index.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Index.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-Statistics.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Statistics.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter/mc-3113-big-TOC.txt
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Data.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Data.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Digest.crc32
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Index.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Index.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-Statistics.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Statistics.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_clust_counter_compact/mc-3113-big-TOC.txt
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Data.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Data.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Digest.crc32
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Index.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Index.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Statistics.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Statistics.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_inaccurate_min_max/mc-3113-big-TOC.txt
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Data.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Data.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Digest.crc32
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Index.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Index.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-Statistics.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Statistics.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple/mc-3113-big-TOC.txt
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Data.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Data.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Digest.crc32
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Digest.crc32
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Index.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Index.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-Statistics.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Statistics.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_compact/mc-3113-big-TOC.txt
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Data.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Data.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Digest.crc32
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Digest.crc32
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Index.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Index.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-Statistics.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Statistics.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter/mc-3113-big-TOC.txt
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Data.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Data.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Digest.crc32
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Digest.crc32
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Index.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Index.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-Statistics.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Statistics.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_simple_counter_compact/mc-3113-big-TOC.txt
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-CompressionInfo.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-CompressionInfo.db
new file mode 100644
index 0000000000..8e08a5dca9
Binary files /dev/null and b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Data.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Data.db
new file mode 100644
index 0000000000..73694b2f46
Binary files /dev/null and b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Data.db differ
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Digest.crc32 b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Digest.crc32
new file mode 100644
index 0000000000..b57ebd32f3
--- /dev/null
+++ b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Digest.crc32
@@ -0,0 +1 @@
+527605309
\ No newline at end of file
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Filter.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Filter.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Filter.db
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Index.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Index.db
new file mode 100644
index 0000000000..0398b1f8a0
Binary files /dev/null and b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Index.db differ
diff --git a/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Statistics.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Statistics.db
new file mode 100644
index 0000000000..fd80793b5b
Binary files /dev/null and b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Summary.db b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Summary.db
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-Summary.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-TOC.txt b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-TOC.txt
rename to test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-TOC.txt
index 6ea912e92c..9e670e31e3 100644
--- a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-TOC.txt
+++ b/test/data/legacy-sstables/mc/legacy_tables/legacy_mc_tuple/mc-3113-big-TOC.txt
@@ -1,8 +1,8 @@
-TOC.txt
-Data.db
 Statistics.db
-Summary.db
+Data.db
 Filter.db
+CompressionInfo.db
+TOC.txt
+Summary.db
 Digest.crc32
 Index.db
-CompressionInfo.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-CompressionInfo.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Data.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Data.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Data.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Digest.crc32 b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Digest.crc32
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Digest.crc32
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Filter.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Filter.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Filter.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Index.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Index.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Index.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Statistics.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-Statistics.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Statistics.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Summary.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Summary.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-Summary.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-TOC.txt b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-1-big-TOC.txt
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust/md-31110-big-TOC.txt
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-CompressionInfo.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Data.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Data.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Data.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Digest.crc32 b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Digest.crc32
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Digest.crc32
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Filter.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Filter.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Filter.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Index.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Index.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Index.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Statistics.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-Statistics.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Statistics.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Summary.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Summary.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-Summary.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-TOC.txt b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-1-big-TOC.txt
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_compact/md-31110-big-TOC.txt
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-CompressionInfo.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Data.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Data.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Data.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Digest.crc32 b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Digest.crc32
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Digest.crc32
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Filter.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Filter.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Filter.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Index.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Index.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Index.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Statistics.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-Statistics.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Statistics.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Summary.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Summary.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-Summary.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-TOC.txt b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-1-big-TOC.txt
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter/md-31110-big-TOC.txt
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-CompressionInfo.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Data.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Data.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Data.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Digest.crc32 b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Digest.crc32
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Digest.crc32
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Filter.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Filter.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Filter.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Index.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Index.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Index.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Statistics.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-Statistics.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Statistics.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Summary.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Summary.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-Summary.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-TOC.txt b/test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-1-big-TOC.txt
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_clust_counter_compact/md-31110-big-TOC.txt
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-CompressionInfo.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Data.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Data.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Data.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Digest.crc32 b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Digest.crc32
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Digest.crc32
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Filter.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Filter.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Filter.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Index.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Index.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Index.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Statistics.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-Statistics.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Statistics.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Summary.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Summary.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-Summary.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-TOC.txt b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-1-big-TOC.txt
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple/md-31110-big-TOC.txt
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-CompressionInfo.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Data.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Data.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Data.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Digest.crc32 b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Digest.crc32
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Filter.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Filter.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Filter.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Index.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Index.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Index.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Statistics.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-Statistics.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Statistics.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Summary.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Summary.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-Summary.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-TOC.txt b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-1-big-TOC.txt
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_compact/md-31110-big-TOC.txt
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-CompressionInfo.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Data.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Data.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Data.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Digest.crc32 b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Digest.crc32
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Filter.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Filter.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Filter.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Index.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Index.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Index.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Statistics.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-Statistics.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Statistics.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Summary.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Summary.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-Summary.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-TOC.txt b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-1-big-TOC.txt
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter/md-31110-big-TOC.txt
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-CompressionInfo.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Data.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Data.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Data.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Digest.crc32 b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Digest.crc32
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Filter.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Filter.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Filter.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Index.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Index.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Index.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Statistics.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-Statistics.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Statistics.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Summary.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Summary.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-Summary.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-TOC.txt b/test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-1-big-TOC.txt
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_simple_counter_compact/md-31110-big-TOC.txt
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-CompressionInfo.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-CompressionInfo.db
new file mode 100644
index 0000000000..8e08a5dca9
Binary files /dev/null and b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Data.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Data.db
new file mode 100644
index 0000000000..0c874f65fa
Binary files /dev/null and b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Data.db differ
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Digest.crc32 b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Digest.crc32
new file mode 100644
index 0000000000..2fc48a9ce7
--- /dev/null
+++ b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Digest.crc32
@@ -0,0 +1 @@
+1520549740
\ No newline at end of file
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Filter.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Filter.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Filter.db
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Index.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Index.db
new file mode 100644
index 0000000000..0398b1f8a0
Binary files /dev/null and b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Index.db differ
diff --git a/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Statistics.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Statistics.db
new file mode 100644
index 0000000000..f4aa1057e0
Binary files /dev/null and b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Summary.db b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Summary.db
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-Summary.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-TOC.txt b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-TOC.txt
rename to test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-TOC.txt
index 6ea912e92c..f2df26ca56 100644
--- a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-TOC.txt
+++ b/test/data/legacy-sstables/md/legacy_tables/legacy_md_tuple/md-31110-big-TOC.txt
@@ -2,7 +2,7 @@ TOC.txt
 Data.db
 Statistics.db
 Summary.db
-Filter.db
-Digest.crc32
 Index.db
+Filter.db
 CompressionInfo.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-CompressionInfo.db
new file mode 100644
index 0000000000..5f53ae0658
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Data.db
new file mode 100644
index 0000000000..2c082def96
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Data.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Digest.crc32
new file mode 100644
index 0000000000..f4803c470f
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Digest.crc32
@@ -0,0 +1 @@
+3346976800
\ No newline at end of file
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Filter.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Filter.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Index.db
new file mode 100644
index 0000000000..8c62daca3b
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Index.db differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Statistics.db
similarity index 64%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Statistics.db
index ef1355cb6e..78bfef8ec5 100644
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Statistics.db and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-TOC.txt
new file mode 100644
index 0000000000..aaf69afa26
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-3025-big-TOC.txt
@@ -0,0 +1,8 @@
+CompressionInfo.db
+TOC.txt
+Filter.db
+Statistics.db
+Data.db
+Summary.db
+Index.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Data.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Data.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Digest.crc32
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Filter.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Filter.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Statistics.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-1-big-TOC.txt
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust/me-31111-big-TOC.txt
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-CompressionInfo.db
new file mode 100644
index 0000000000..dfbc93bfef
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Data.db
new file mode 100644
index 0000000000..4b3dc5714c
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Data.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Digest.crc32
new file mode 100644
index 0000000000..afe9d49691
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Digest.crc32
@@ -0,0 +1 @@
+2310485613
\ No newline at end of file
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Filter.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Filter.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Index.db
similarity index 99%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Index.db
index 8b23beed90..a4f797dfc9 100644
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Index.db and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Index.db differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Statistics.db
similarity index 64%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Statistics.db
index 4a3ab075fc..a2aaf2853b 100644
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Statistics.db and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-TOC.txt
new file mode 100644
index 0000000000..aaf69afa26
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-3025-big-TOC.txt
@@ -0,0 +1,8 @@
+CompressionInfo.db
+TOC.txt
+Filter.db
+Statistics.db
+Data.db
+Summary.db
+Index.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Data.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Data.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Digest.crc32
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Filter.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Filter.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Statistics.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-1-big-TOC.txt
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_compact/me-31111-big-TOC.txt
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Data.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Data.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Digest.crc32
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Filter.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Filter.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Statistics.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-1-big-TOC.txt
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter/me-31111-big-TOC.txt
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-CompressionInfo.db
new file mode 100644
index 0000000000..c0a4633f44
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Data.db
new file mode 100644
index 0000000000..5f592c4e84
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Data.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Digest.crc32
new file mode 100644
index 0000000000..17149972eb
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Digest.crc32
@@ -0,0 +1 @@
+704145780
\ No newline at end of file
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Filter.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Filter.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Index.db
similarity index 99%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Index.db
index a8fdb3cb11..baadf5f364 100644
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Index.db and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Index.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Statistics.db
new file mode 100644
index 0000000000..c481e489b6
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-TOC.txt
new file mode 100644
index 0000000000..aaf69afa26
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-3025-big-TOC.txt
@@ -0,0 +1,8 @@
+CompressionInfo.db
+TOC.txt
+Filter.db
+Statistics.db
+Data.db
+Summary.db
+Index.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Data.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Data.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Digest.crc32
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Filter.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Filter.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Statistics.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-1-big-TOC.txt
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_clust_counter_compact/me-31111-big-TOC.txt
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Data.db
new file mode 100644
index 0000000000..a630c4ff9c
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Data.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Digest.crc32
new file mode 100644
index 0000000000..a51df1bb92
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Digest.crc32
@@ -0,0 +1 @@
+1415075435
\ No newline at end of file
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Filter.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Filter.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Statistics.db
new file mode 100644
index 0000000000..5db2740efe
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-TOC.txt
new file mode 100644
index 0000000000..aaf69afa26
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-3025-big-TOC.txt
@@ -0,0 +1,8 @@
+CompressionInfo.db
+TOC.txt
+Filter.db
+Statistics.db
+Data.db
+Summary.db
+Index.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-CompressionInfo.db
new file mode 100644
index 0000000000..0b7faea4a8
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Data.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Data.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Digest.crc32
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Filter.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Statistics.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-1-big-TOC.txt
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple/me-31111-big-TOC.txt
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Data.db
new file mode 100644
index 0000000000..4243803bc1
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Data.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Digest.crc32
new file mode 100644
index 0000000000..99ffe738ab
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Digest.crc32
@@ -0,0 +1 @@
+2721811463
\ No newline at end of file
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Filter.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Statistics.db
new file mode 100644
index 0000000000..ae651c4e08
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-TOC.txt
new file mode 100644
index 0000000000..aaf69afa26
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-3025-big-TOC.txt
@@ -0,0 +1,8 @@
+CompressionInfo.db
+TOC.txt
+Filter.db
+Statistics.db
+Data.db
+Summary.db
+Index.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-CompressionInfo.db
new file mode 100644
index 0000000000..adb7fc4579
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Data.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Data.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Digest.crc32
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Filter.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Statistics.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-1-big-TOC.txt
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_compact/me-31111-big-TOC.txt
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Data.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Data.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Digest.crc32
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Filter.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Statistics.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-1-big-TOC.txt
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter/me-31111-big-TOC.txt
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Data.db
new file mode 100644
index 0000000000..b8a8f0e6a0
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Data.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Digest.crc32
new file mode 100644
index 0000000000..80dc60278f
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Digest.crc32
@@ -0,0 +1 @@
+3723331170
\ No newline at end of file
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Filter.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Statistics.db
new file mode 100644
index 0000000000..8bdebb6547
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-TOC.txt
new file mode 100644
index 0000000000..aaf69afa26
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-3025-big-TOC.txt
@@ -0,0 +1,8 @@
+CompressionInfo.db
+TOC.txt
+Filter.db
+Statistics.db
+Data.db
+Summary.db
+Index.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-CompressionInfo.db
new file mode 100644
index 0000000000..56c95a8a36
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Data.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Data.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Digest.crc32
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Filter.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Index.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Index.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-Statistics.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Statistics.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-1-big-TOC.txt
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_simple_counter_compact/me-31111-big-TOC.txt
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-CompressionInfo.db
new file mode 100644
index 0000000000..916b491e39
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Data.db
new file mode 100644
index 0000000000..a05ba8371a
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Data.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Digest.crc32
new file mode 100644
index 0000000000..6a41d2d577
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Digest.crc32
@@ -0,0 +1 @@
+416438660
\ No newline at end of file
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Filter.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Index.db
new file mode 100644
index 0000000000..7cb91dc9b3
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Index.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Statistics.db
new file mode 100644
index 0000000000..4fd6530c86
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-TOC.txt
new file mode 100644
index 0000000000..aaf69afa26
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple/me-31111-big-TOC.txt
@@ -0,0 +1,8 @@
+CompressionInfo.db
+TOC.txt
+Filter.db
+Statistics.db
+Data.db
+Summary.db
+Index.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-CompressionInfo.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-CompressionInfo.db
new file mode 100644
index 0000000000..916b491e39
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Data.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Data.db
new file mode 100644
index 0000000000..af0f76965a
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Data.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Digest.crc32 b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Digest.crc32
new file mode 100644
index 0000000000..48b3a9b823
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Digest.crc32
@@ -0,0 +1 @@
+601622112
\ No newline at end of file
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Filter.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Filter.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Index.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Index.db
new file mode 100644
index 0000000000..7cb91dc9b3
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Index.db differ
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Statistics.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Statistics.db
new file mode 100644
index 0000000000..f4d51e7127
Binary files /dev/null and b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Summary.db b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Summary.db
rename to test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-Summary.db
diff --git a/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-TOC.txt b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-TOC.txt
new file mode 100644
index 0000000000..aaf69afa26
--- /dev/null
+++ b/test/data/legacy-sstables/me/legacy_tables/legacy_me_tuple_compact/me-31111-big-TOC.txt
@@ -0,0 +1,8 @@
+CompressionInfo.db
+TOC.txt
+Filter.db
+Statistics.db
+Data.db
+Summary.db
+Index.db
+Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-CompressionInfo.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Data.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Data.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Data.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Digest.crc32 b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Digest.crc32
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Filter.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Filter.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Filter.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Index.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Index.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Index.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Statistics.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-Statistics.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Summary.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Summary.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-Summary.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-TOC.txt b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-1-big-TOC.txt
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust/na-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-CompressionInfo.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Data.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Data.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Data.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Digest.crc32 b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Digest.crc32
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Filter.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Filter.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Index.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Index.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Index.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Statistics.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-Statistics.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Summary.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Summary.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-Summary.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-TOC.txt b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-1-big-TOC.txt
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_compact/na-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-CompressionInfo.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Data.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Data.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Data.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Digest.crc32 b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Digest.crc32
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Filter.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Filter.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Filter.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Index.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Index.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Index.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Statistics.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-Statistics.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Summary.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Summary.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-Summary.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-TOC.txt b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-1-big-TOC.txt
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter/na-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-CompressionInfo.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Data.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Data.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Data.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Digest.crc32 b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Digest.crc32
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Filter.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Filter.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Index.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Index.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Index.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Statistics.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-Statistics.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Summary.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Summary.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-Summary.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-TOC.txt b/test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-1-big-TOC.txt
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_clust_counter_compact/na-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-CompressionInfo.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Data.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Data.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Data.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Digest.crc32 b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Digest.crc32
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Filter.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Filter.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Filter.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Index.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Index.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Index.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Statistics.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-Statistics.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Summary.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Summary.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-Summary.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-TOC.txt b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-1-big-TOC.txt
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple/na-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-CompressionInfo.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Data.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Data.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Data.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Digest.crc32 b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Digest.crc32
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Filter.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Filter.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Index.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Index.db
new file mode 100644
index 0000000000..56f29df1cb
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Index.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Statistics.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-Statistics.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Summary.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Summary.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-Summary.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-TOC.txt b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-1-big-TOC.txt
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_compact/na-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-CompressionInfo.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Data.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Data.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Data.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Digest.crc32 b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Digest.crc32
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Filter.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Filter.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Filter.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Index.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Index.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Index.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Statistics.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-Statistics.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Summary.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Summary.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-Summary.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-TOC.txt b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-1-big-TOC.txt
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter/na-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-CompressionInfo.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Data.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Data.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Data.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Digest.crc32 b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Digest.crc32
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Filter.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Filter.db
new file mode 100644
index 0000000000..2e1d5d29ca
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Filter.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Index.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Index.db
new file mode 100644
index 0000000000..d094f73e21
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Index.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Statistics.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-Statistics.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Summary.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Summary.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Summary.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-Summary.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-TOC.txt b/test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-1-big-TOC.txt
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_simple_counter_compact/na-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-CompressionInfo.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-CompressionInfo.db
new file mode 100644
index 0000000000..f69c841bc2
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Data.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Data.db
new file mode 100644
index 0000000000..722922d2cf
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Data.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Digest.crc32 b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Digest.crc32
new file mode 100644
index 0000000000..1e72b0fd43
--- /dev/null
+++ b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Digest.crc32
@@ -0,0 +1 @@
+2035855651
\ No newline at end of file
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Filter.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Filter.db
rename to test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Filter.db
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Index.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Index.db
new file mode 100644
index 0000000000..f33dab8bba
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Index.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Statistics.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Statistics.db
new file mode 100644
index 0000000000..b7a6da2db1
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Summary.db b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-Summary.db differ
diff --git a/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-TOC.txt b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-TOC.txt
new file mode 100644
index 0000000000..ed377e244e
--- /dev/null
+++ b/test/data/legacy-sstables/na/legacy_tables/legacy_na_tuple/na-400-big-TOC.txt
@@ -0,0 +1,8 @@
+Data.db
+CompressionInfo.db
+Digest.crc32
+Statistics.db
+Filter.db
+Index.db
+Summary.db
+TOC.txt
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-CompressionInfo.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Data.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Data.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Data.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Digest.crc32
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Filter.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Filter.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Filter.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Index.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Index.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Index.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Statistics.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Summary.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-Summary.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-CompressionInfo.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Data.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Data.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Data.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Digest.crc32
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Filter.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Filter.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Filter.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Index.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Index.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Index.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Statistics.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Summary.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-Summary.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-TOC.txt
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-CompressionInfo.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Data.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Data.db
new file mode 100644
index 0000000000..a72b4ee380
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Data.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Digest.crc32
new file mode 100644
index 0000000000..682a656d01
--- /dev/null
+++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Digest.crc32
@@ -0,0 +1 @@
+626505151
\ No newline at end of file
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Filter.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Filter.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Filter.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Index.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Index.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Index.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Statistics.db
similarity index 84%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Statistics.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Statistics.db
index f9940d0cf8..836b7091cc 100644
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Statistics.db and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Summary.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-Summary.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-TOC.txt
new file mode 100644
index 0000000000..8484db9098
--- /dev/null
+++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-3gll_1kke_3qdyo2i4kzfpt3cqcy-big-TOC.txt
@@ -0,0 +1,8 @@
+Filter.db
+Statistics.db
+TOC.txt
+Index.db
+Summary.db
+Digest.crc32
+Data.db
+CompressionInfo.db
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-CompressionInfo.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Data.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Data.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Data.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Digest.crc32
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Filter.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Filter.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Filter.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Index.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Index.db
new file mode 100644
index 0000000000..b3094bffba
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Index.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Statistics.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Summary.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Summary.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-TOC.txt
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-CompressionInfo.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Data.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Data.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Data.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Digest.crc32
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Digest.crc32
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Filter.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Filter.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Filter.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Index.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Index.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Index.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Statistics.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Statistics.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Summary.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-Summary.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-TOC.txt
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-CompressionInfo.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-CompressionInfo.db
new file mode 100644
index 0000000000..361f57d7d4
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Data.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Data.db
new file mode 100644
index 0000000000..e97f414ff0
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Data.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Digest.crc32
new file mode 100644
index 0000000000..7b1035c7ce
--- /dev/null
+++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Digest.crc32
@@ -0,0 +1 @@
+3757037919
\ No newline at end of file
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Filter.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Filter.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Filter.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Index.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Index.db
new file mode 100644
index 0000000000..0398b1f8a0
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Index.db differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Statistics.db
similarity index 81%
rename from test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Statistics.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Statistics.db
index ead79f6f29..6dc52a3c8b 100644
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Statistics.db and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Summary.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-Summary.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-TOC.txt
new file mode 100644
index 0000000000..8484db9098
--- /dev/null
+++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-3gll_1kke_4abk02i4kzfpt3cqcy-big-TOC.txt
@@ -0,0 +1,8 @@
+Filter.db
+Statistics.db
+TOC.txt
+Index.db
+Summary.db
+Digest.crc32
+Data.db
+CompressionInfo.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-CompressionInfo.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-CompressionInfo.db
new file mode 100644
index 0000000000..f69c841bc2
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Data.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Data.db
new file mode 100644
index 0000000000..eda05d21c5
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Data.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Digest.crc32
new file mode 100644
index 0000000000..3b8ed43b90
--- /dev/null
+++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Digest.crc32
@@ -0,0 +1 @@
+4271820172
\ No newline at end of file
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Filter.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Filter.db
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Filter.db
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Index.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Index.db
new file mode 100644
index 0000000000..f33dab8bba
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Index.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Statistics.db
new file mode 100644
index 0000000000..a6348d64d0
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Summary.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-Summary.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-TOC.txt
rename to test/data/legacy-sstables/nb/legacy_tables/legacy_nb_tuple/nb-400-big-TOC.txt
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-CompressionInfo.db b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-CompressionInfo.db
deleted file mode 100644
index 2abf0a8898..0000000000
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-CompressionInfo.db and /dev/null differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Data.db b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Data.db
deleted file mode 100644
index 8db5dadcd0..0000000000
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Data.db and /dev/null differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Digest.crc32 b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Digest.crc32
deleted file mode 100644
index a3554fabfc..0000000000
--- a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust/nc-1-big-Digest.crc32
+++ /dev/null
@@ -1 +0,0 @@
-516351458
\ No newline at end of file
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-CompressionInfo.db b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-CompressionInfo.db
deleted file mode 100644
index d0ab8d2669..0000000000
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-CompressionInfo.db and /dev/null differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Data.db b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Data.db
deleted file mode 100644
index c212d3df38..0000000000
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Data.db and /dev/null differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Digest.crc32 b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Digest.crc32
deleted file mode 100644
index 3e0bf3e604..0000000000
--- a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_clust_counter/nc-1-big-Digest.crc32
+++ /dev/null
@@ -1 +0,0 @@
-3677152410
\ No newline at end of file
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Data.db b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Data.db
deleted file mode 100644
index fe53589beb..0000000000
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Data.db and /dev/null differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Digest.crc32 b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Digest.crc32
deleted file mode 100644
index 67f6298a97..0000000000
--- a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple/nc-1-big-Digest.crc32
+++ /dev/null
@@ -1 +0,0 @@
-1155625239
\ No newline at end of file
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-CompressionInfo.db b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-CompressionInfo.db
deleted file mode 100644
index 1db9aa06b3..0000000000
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-CompressionInfo.db and /dev/null differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Data.db b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Data.db
deleted file mode 100644
index 1431e3e27d..0000000000
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Data.db and /dev/null differ
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Digest.crc32 b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Digest.crc32
deleted file mode 100644
index 18641177fb..0000000000
--- a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Digest.crc32
+++ /dev/null
@@ -1 +0,0 @@
-4045937701
\ No newline at end of file
diff --git a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Index.db b/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Index.db
deleted file mode 100644
index 59e65cab85..0000000000
Binary files a/test/data/legacy-sstables/nc/legacy_tables/legacy_nc_simple_counter/nc-1-big-Index.db and /dev/null differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-CompressionInfo.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Data.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Data.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Data.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Digest.crc32 b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Digest.crc32
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Digest.crc32
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Filter.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Filter.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Filter.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Index.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Index.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Index.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Statistics.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-1-big-Statistics.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Statistics.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Summary.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-Summary.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-TOC.txt b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-TOC.txt
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust/oa-500-big-TOC.txt
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-CompressionInfo.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Data.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Data.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Data.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Digest.crc32 b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Digest.crc32
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Digest.crc32
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Filter.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Filter.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Filter.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Index.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Index.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Index.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Statistics.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-1-big-Statistics.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Statistics.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Summary.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-Summary.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-TOC.txt b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-TOC.txt
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_clust_counter/oa-500-big-TOC.txt
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-CompressionInfo.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Data.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Data.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Data.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Digest.crc32 b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Digest.crc32
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Digest.crc32
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Filter.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Filter.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Filter.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Filter.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Index.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Index.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Index.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Statistics.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-1-big-Statistics.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Statistics.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Summary.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-Summary.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-TOC.txt b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-TOC.txt
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-TOC.txt
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple/oa-500-big-TOC.txt
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-CompressionInfo.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-CompressionInfo.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-CompressionInfo.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-CompressionInfo.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Data.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Data.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Data.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Data.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Digest.crc32 b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Digest.crc32
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Digest.crc32
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Digest.crc32
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Filter.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Filter.db
new file mode 100644
index 0000000000..8868e5c180
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Filter.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Index.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Index.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Index.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Index.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Statistics.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Statistics.db
similarity index 100%
rename from test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-1-big-Statistics.db
rename to test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Statistics.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Summary.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-Summary.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-TOC.txt b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-TOC.txt
new file mode 100644
index 0000000000..576c5e0598
--- /dev/null
+++ b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_simple_counter/oa-500-big-TOC.txt
@@ -0,0 +1,8 @@
+Data.db
+Statistics.db
+Digest.crc32
+TOC.txt
+CompressionInfo.db
+Filter.db
+Index.db
+Summary.db
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-CompressionInfo.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-CompressionInfo.db
new file mode 100644
index 0000000000..5a82349dd2
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-CompressionInfo.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Data.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Data.db
new file mode 100644
index 0000000000..f605927b22
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Data.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Digest.crc32 b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Digest.crc32
new file mode 100644
index 0000000000..c5c321ba18
--- /dev/null
+++ b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Digest.crc32
@@ -0,0 +1 @@
+3312043736
\ No newline at end of file
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Filter.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Filter.db
new file mode 100644
index 0000000000..8868e5c180
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Filter.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Index.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Index.db
new file mode 100644
index 0000000000..8d7a18f061
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Index.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Statistics.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Statistics.db
new file mode 100644
index 0000000000..979a9a888c
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Statistics.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Summary.db b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Summary.db
new file mode 100644
index 0000000000..9b24e0450c
Binary files /dev/null and b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-Summary.db differ
diff --git a/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-TOC.txt b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-TOC.txt
new file mode 100644
index 0000000000..576c5e0598
--- /dev/null
+++ b/test/data/legacy-sstables/oa/legacy_tables/legacy_oa_tuple/oa-500-big-TOC.txt
@@ -0,0 +1,8 @@
+Data.db
+Statistics.db
+Digest.crc32
+TOC.txt
+CompressionInfo.db
+Filter.db
+Index.db
+Summary.db
diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
index 3a1bf38e03..8081b9bffb 100644
--- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
@@ -19,13 +19,14 @@ package org.apache.cassandra.io.sstable;
 
 
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import org.junit.After;
@@ -53,6 +54,7 @@ import org.apache.cassandra.dht.IPartitioner;
 import org.apache.cassandra.dht.Range;
 import org.apache.cassandra.dht.Token;
 import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.exceptions.InvalidRequestException;
 import org.apache.cassandra.io.sstable.format.SSTableFormat;
 import org.apache.cassandra.io.sstable.format.SSTableReader;
 import org.apache.cassandra.io.sstable.format.Version;
@@ -95,13 +97,22 @@ public class LegacySSTableTest
      * When adding a new sstable version, add that one here.
      * See {@link #testGenerateSstables()} to generate sstables.
      * Take care on commit as you need to add the sstable files using {@code git add -f}
+     *
+     * There are two me sstables, where the sequence number indicates the C* version they come from.
+     * For example:
+     *     me-3025-big-* sstables are generated from 3.0.25
+     *     me-31111-big-* sstables are generated from 3.11.11
+     * Both exist because of differences introduced in 3.6 (and 3.11) in how frozen multi-cell headers are serialised
+     *  without the sstable format `me` being bumped, ref CASSANDRA-15035
+     *
+     * Sequence numbers represent the C* version used when creating the SSTable, i.e. with #testGenerateSstables()
      */
     public static String[] legacyVersions = null;
 
     // Get all versions up to the current one. Useful for testing in compatibility mode C18301
     private static String[] getValidLegacyVersions()
     {
-        String[] versions = {"oa", "da", "nb", "na", "me", "md", "mc", "mb", "ma"};
+        String[] versions = {"da", "oa", "nb", "na", "me", "md", "mc", "mb", "ma"};
         return Arrays.stream(versions).filter((v) -> v.compareTo(BigFormat.getInstance().getLatestVersion().toString()) <= 0).toArray(String[]::new);
     }
 
@@ -138,7 +149,6 @@ public class LegacySSTableTest
         {
             createTables(legacyVersion);
         }
-
     }
 
     @After
@@ -155,9 +165,11 @@ public class LegacySSTableTest
      */
     protected Descriptor getDescriptor(String legacyVersion, String table) throws IOException
     {
-        File[] files = getTableDir(legacyVersion, table).list();
-        Preconditions.checkArgument(files.length > 0, "No files for version=%s and table=%s", legacyVersion, table);
-        return Descriptor.fromFileWithComponent(files[0]).left;
+        Path file = Files.list(getTableDir(legacyVersion, table).toPath())
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException(String.format("No files for verion=%s and table=%s", legacyVersion, table)));
+
+        return Descriptor.fromFile(new File(file));
     }
 
     @Test
@@ -317,7 +329,7 @@ public class LegacySSTableTest
     public void testInaccurateSSTableMinMax() throws Exception
     {
         QueryProcessor.executeInternal("CREATE TABLE legacy_tables.legacy_mc_inaccurate_min_max (k int, c1 int, c2 int, c3 int, v int, primary key (k, c1, c2, c3))");
-        loadLegacyTable("legacy_%s_inaccurate_min_max", "mc");
+        loadLegacyTable("mc", "inaccurate_min_max");
 
         /*
          sstable has the following mutations:
@@ -335,12 +347,65 @@ public class LegacySSTableTest
     }
 
     @Test
-    public void testVerifyOldSSTables() throws IOException
+    public void testVerifyOldSimpleSSTables() throws IOException
+    {
+        verifyOldSSTables("simple");
+    }
+
+    @Test
+    public void testVerifyOldTupleSSTables() throws IOException
+    {
+        verifyOldSSTables("tuple");
+    }
+
+    @Test
+    public void testVerifyOldDroppedTupleSSTables() throws IOException
+    {
+        try {
+            for (String legacyVersion : legacyVersions)
+            {
+                QueryProcessor.executeInternal(String.format("ALTER TABLE legacy_tables.legacy_%s_tuple DROP val", legacyVersion));
+                QueryProcessor.executeInternal(String.format("ALTER TABLE legacy_tables.legacy_%s_tuple DROP val2", legacyVersion));
+                QueryProcessor.executeInternal(String.format("ALTER TABLE legacy_tables.legacy_%s_tuple DROP val3", legacyVersion));
+                // dropping non-frozen UDTs disabled, see AlterTableStatement.DropColumns.dropColumn(..)
+                //QueryProcessor.executeInternal(String.format("ALTER TABLE legacy_tables.legacy_%s_tuple DROP val4", legacyVersion));
+            }
+
+            verifyOldSSTables("tuple");
+        }
+        finally
+        {
+            for (String legacyVersion : legacyVersions)
+            {
+                alterTableAddColumn(legacyVersion, "val frozen<tuple<set<int>,set<text>>>");
+                alterTableAddColumn(legacyVersion, "val2 tuple<set<int>,set<text>>");
+                try
+                {
+                    alterTableAddColumn(legacyVersion, String.format("val3 frozen<legacy_%s_tuple_udt>", legacyVersion));
+                    throw new AssertionError(String.format("Against legacyVersion %s expected InvalidRequestException: Cannot re-add previously dropped column 'val3' of type frozen<legacy_da_tuple_udt>, incompatible with previous type frozen<tuple<frozen<tuple<text, text>>>>", legacyVersion));
+                }
+                catch (InvalidRequestException ex)
+                {
+                    // expected
+                    // InvalidRequestException: Cannot re-add previously dropped column 'val3' of type frozen<legacy_da_tuple_udt>, incompatible with previous type frozen<tuple<frozen<tuple<text, text>>>>
+                }
+                // dropping non-frozen UDTs disabled, see AlterTableStatement.DropColumns.dropColumn(..)
+                //alterTableAddColumn(legacyVersion, String.format("val4 legacy_%s_tuple_udt", legacyVersion));
+            }
+        }
+    }
+
+    private static void alterTableAddColumn(String legacyVersion, String column_definition)
+    {
+        QueryProcessor.executeInternal(String.format("ALTER TABLE legacy_tables.legacy_%s_tuple ADD IF NOT EXISTS %s", legacyVersion, column_definition));
+    }
+
+    private void verifyOldSSTables(String tableSuffix) throws IOException
     {
         for (String legacyVersion : legacyVersions)
         {
-            ColumnFamilyStore cfs = Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_simple", legacyVersion));
-            loadLegacyTable("legacy_%s_simple", legacyVersion);
+            ColumnFamilyStore cfs = Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_%s", legacyVersion, tableSuffix));
+            loadLegacyTable(legacyVersion, tableSuffix);
 
             for (SSTableReader sstable : cfs.getLiveSSTables())
             {
@@ -374,7 +439,7 @@ public class LegacySSTableTest
         for (String legacyVersion : legacyVersions)
         {
             ColumnFamilyStore cfs = Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_simple", legacyVersion));
-            loadLegacyTable("legacy_%s_simple", legacyVersion);
+            loadLegacyTable(legacyVersion, "simple");
 
             boolean shouldFail = !cfs.getLiveSSTables().stream().allMatch(sstable -> sstable.descriptor.version.hasPendingRepair());
             IPartitioner p = Iterables.getFirst(cfs.getLiveSSTables(), null).getPartitioner();
@@ -422,27 +487,34 @@ public class LegacySSTableTest
 
     private void streamLegacyTables(String legacyVersion) throws Exception
     {
-            logger.info("Streaming legacy version {}", legacyVersion);
-            streamLegacyTable("legacy_%s_simple", legacyVersion);
-            streamLegacyTable("legacy_%s_simple_counter", legacyVersion);
-            streamLegacyTable("legacy_%s_clust", legacyVersion);
-            streamLegacyTable("legacy_%s_clust_counter", legacyVersion);
+        logger.info("Streaming legacy version {}", legacyVersion);
+        streamLegacyTable("legacy_%s_simple", legacyVersion);
+        streamLegacyTable("legacy_%s_simple_counter", legacyVersion);
+        streamLegacyTable("legacy_%s_clust", legacyVersion);
+        streamLegacyTable("legacy_%s_clust_counter", legacyVersion);
+        streamLegacyTable("legacy_%s_tuple", legacyVersion);
     }
 
     private void streamLegacyTable(String tablePattern, String legacyVersion) throws Exception
     {
         String table = String.format(tablePattern, legacyVersion);
-        SSTableReader sstable = SSTableReader.open(null, getDescriptor(legacyVersion, table));
-        IPartitioner p = sstable.getPartitioner();
-        List<Range<Token>> ranges = new ArrayList<>();
-        ranges.add(new Range<>(p.getMinimumToken(), p.getToken(ByteBufferUtil.bytes("100"))));
-        ranges.add(new Range<>(p.getToken(ByteBufferUtil.bytes("100")), p.getMinimumToken()));
-        List<OutgoingStream> streams = Lists.newArrayList(new CassandraOutgoingFile(StreamOperation.OTHER,
-                                                                                    sstable.ref(),
-                                                                                    sstable.getPositionsForRanges(ranges),
-                                                                                    ranges,
-                                                                                    sstable.estimatedKeysForRanges(ranges)));
-        new StreamPlan(StreamOperation.OTHER).transferStreams(FBUtilities.getBroadcastAddressAndPort(), streams).execute().get();
+        Descriptor descriptor = getDescriptor(legacyVersion, table);
+        if (null != descriptor)
+        {
+            SSTableReader sstable = SSTableReader.open(null, getDescriptor(legacyVersion, table));
+            IPartitioner p = sstable.getPartitioner();
+            List<Range<Token>> ranges = new ArrayList<>();
+            ranges.add(new Range<>(p.getMinimumToken(), p.getToken(ByteBufferUtil.bytes("100"))));
+            ranges.add(new Range<>(p.getToken(ByteBufferUtil.bytes("100")), p.getMinimumToken()));
+
+            List<OutgoingStream> streams = Lists.newArrayList(new CassandraOutgoingFile(StreamOperation.OTHER,
+                    sstable.ref(),
+                    sstable.getPositionsForRanges(ranges),
+                    ranges,
+                    sstable.estimatedKeysForRanges(ranges)));
+
+            new StreamPlan(StreamOperation.OTHER).transferStreams(FBUtilities.getBroadcastAddressAndPort(), streams).execute().get();
+        }
     }
 
     public static void truncateLegacyTables(String legacyVersion) throws Exception
@@ -452,6 +524,9 @@ public class LegacySSTableTest
         Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_simple_counter", legacyVersion)).truncateBlocking();
         Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_clust", legacyVersion)).truncateBlocking();
         Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_clust_counter", legacyVersion)).truncateBlocking();
+        Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_tuple", legacyVersion)).truncateBlocking();
+        CacheService.instance.invalidateCounterCache();
+        CacheService.instance.invalidateKeyCache();
     }
 
     private static void compactLegacyTables(String legacyVersion) throws Exception
@@ -461,15 +536,17 @@ public class LegacySSTableTest
         Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_simple_counter", legacyVersion)).forceMajorCompaction();
         Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_clust", legacyVersion)).forceMajorCompaction();
         Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_clust_counter", legacyVersion)).forceMajorCompaction();
+        Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(String.format("legacy_%s_tuple", legacyVersion)).forceMajorCompaction();
     }
 
     public static void loadLegacyTables(String legacyVersion) throws Exception
     {
-            logger.info("Preparing legacy version {}", legacyVersion);
-            loadLegacyTable("legacy_%s_simple", legacyVersion);
-            loadLegacyTable("legacy_%s_simple_counter", legacyVersion);
-            loadLegacyTable("legacy_%s_clust", legacyVersion);
-            loadLegacyTable("legacy_%s_clust_counter", legacyVersion);
+        logger.info("Preparing legacy version {}", legacyVersion);
+        loadLegacyTable(legacyVersion, "simple");
+        loadLegacyTable(legacyVersion, "simple_counter");
+        loadLegacyTable(legacyVersion, "clust");
+        loadLegacyTable(legacyVersion, "clust_counter");
+        loadLegacyTable(legacyVersion, "tuple");
     }
 
     private static void verifyCache(String legacyVersion, long startCount) throws InterruptedException, java.util.concurrent.ExecutionException
@@ -567,6 +644,21 @@ public class LegacySSTableTest
         QueryProcessor.executeInternal(String.format("CREATE TABLE legacy_tables.legacy_%s_simple_counter (pk text PRIMARY KEY, val counter)", legacyVersion));
         QueryProcessor.executeInternal(String.format("CREATE TABLE legacy_tables.legacy_%s_clust (pk text, ck text, val text, PRIMARY KEY (pk, ck))", legacyVersion));
         QueryProcessor.executeInternal(String.format("CREATE TABLE legacy_tables.legacy_%s_clust_counter (pk text, ck text, val counter, PRIMARY KEY (pk, ck))", legacyVersion));
+
+
+        QueryProcessor.executeInternal(String.format("CREATE TYPE legacy_tables.legacy_%s_tuple_udt (name tuple<text,text>)", legacyVersion));
+
+        if (legacyVersion.startsWith("m"))
+        {
+            // sstable formats possibly from 3.0.x would have had a schema with everything frozen
+            QueryProcessor.executeInternal(String.format("CREATE TABLE legacy_tables.legacy_%1$s_tuple (pk text PRIMARY KEY, " +
+                    "val frozen<tuple<set<int>,set<text>>>, val2 frozen<tuple<set<int>,set<text>>>, val3 frozen<legacy_%1$s_tuple_udt>, val4 frozen<legacy_%1$s_tuple_udt>, extra text)", legacyVersion));
+        }
+        else
+        {
+            QueryProcessor.executeInternal(String.format("CREATE TABLE legacy_tables.legacy_%1$s_tuple (pk text PRIMARY KEY, " +
+                "val frozen<tuple<set<int>,set<text>>>, val2 tuple<set<int>,set<text>>, val3 frozen<legacy_%1$s_tuple_udt>, val4 legacy_%1$s_tuple_udt, extra text)", legacyVersion));
+        }
     }
 
     private static void truncateTables(String legacyVersion)
@@ -592,10 +684,9 @@ public class LegacySSTableTest
         }
     }
 
-    private static void loadLegacyTable(String tablePattern, String legacyVersion) throws IOException
+    private static void loadLegacyTable(String legacyVersion, String tableSuffix) throws IOException
     {
-        String table = String.format(tablePattern, legacyVersion);
-
+        String table = String.format("legacy_%s_%s", legacyVersion, tableSuffix);
         logger.info("Loading legacy table {}", table);
 
         ColumnFamilyStore cfs = Keyspace.open(LEGACY_TABLES_KEYSPACE).getColumnFamilyStore(table);
@@ -609,9 +700,11 @@ public class LegacySSTableTest
     }
 
     /**
-     * Generates sstables for 8 CQL tables (see {@link #createTables(String)}) in <i>current</i>
+     * Generates sstables for CQL tables (see {@link #createTables(String)}) in <i>current</i>
      * sstable format (version) into {@code test/data/legacy-sstables/VERSION}, where
      * {@code VERSION} matches {@link Version#version BigFormat.latestVersion.getVersion()}.
+     *
+     * Sequence numbers are changed to represent the C* version used when creating the SSTable.
      * <p>
      * Run this test alone (e.g. from your IDE) when a new version is introduced or format changed
      * during development. I.e. remove the {@code @Ignore} annotation temporarily.
@@ -639,6 +732,11 @@ public class LegacySSTableTest
             QueryProcessor.executeInternal(String.format("UPDATE legacy_tables.legacy_%s_simple_counter SET val = val + 1 WHERE pk = '%s'",
                                                          format.getLatestVersion(), valPk));
 
+            QueryProcessor.executeInternal(
+                    String.format("INSERT INTO legacy_tables.legacy_%s_tuple (pk, val, val2, val3, val4, extra)"
+                                    + " VALUES ('%s', ({1,2,3},{'a','b','c'}), ({1,2,3},{'a','b','c'}), {name: ('abc','def')}, {name: ('abc','def')}, '%s')",
+                                  format.getLatestVersion(), valPk, randomString));
+
             for (int ck = 0; ck < 50; ck++)
             {
                 String valCk = Integer.toString(ck);
@@ -655,14 +753,21 @@ public class LegacySSTableTest
 
         File ksDir = new File(LEGACY_SSTABLE_ROOT, String.format("%s/legacy_tables", format.getLatestVersion()));
         ksDir.tryCreateDirectories();
-        copySstablesFromTestData(String.format("legacy_%s_simple", format.getLatestVersion()), ksDir, LEGACY_TABLES_KEYSPACE);
-        copySstablesFromTestData(String.format("legacy_%s_simple_counter", format.getLatestVersion()), ksDir, LEGACY_TABLES_KEYSPACE);
-        copySstablesFromTestData(String.format("legacy_%s_clust", format.getLatestVersion()), ksDir, LEGACY_TABLES_KEYSPACE);
-        copySstablesFromTestData(String.format("legacy_%s_clust_counter", format.getLatestVersion()), ksDir, LEGACY_TABLES_KEYSPACE);
+        copySstablesFromTestData(format.getLatestVersion(), "legacy_%s_simple", ksDir);
+        copySstablesFromTestData(format.getLatestVersion(), "legacy_%s_simple_counter", ksDir);
+        copySstablesFromTestData(format.getLatestVersion(), "legacy_%s_clust", ksDir);
+        copySstablesFromTestData(format.getLatestVersion(), "legacy_%s_clust_counter", ksDir);
+        copySstablesFromTestData(format.getLatestVersion(), "legacy_%s_tuple", ksDir);
     }
 
-    public static void copySstablesFromTestData(String table, File ksDir, String ks) throws IOException
+    public static void copySstablesFromTestData(Version legacyVersion, String tablePattern, File ksDir) throws IOException
     {
+        copySstablesFromTestData(legacyVersion, tablePattern, ksDir, LEGACY_TABLES_KEYSPACE);
+    }
+
+    public static void copySstablesFromTestData(Version legacyVersion, String tablePattern, File ksDir, String ks) throws IOException
+    {
+        String table = String.format(tablePattern, legacyVersion);
         File cfDir = new File(ksDir, table);
         cfDir.tryCreateDirectory();
 
@@ -670,7 +775,10 @@ public class LegacySSTableTest
         {
             for (File file : srcDir.tryList())
             {
-                copyFile(cfDir, file);
+                // Sequence IDs represent the C* version used when creating the SSTable, i.e. with #testGenerateSstables() (if not uuid based)
+                String newSeqId = FBUtilities.getReleaseVersionString().split("-")[0].replaceAll("[^0-9]", "");
+                File target = new File(cfDir, file.name().replace(legacyVersion + "-1-", legacyVersion + "-" + newSeqId + "-"));
+                copyFile(cfDir, file, target);
             }
         }
     }
@@ -680,9 +788,7 @@ public class LegacySSTableTest
         File tableDir = getTableDir(legacyVersion, table);
         Assert.assertTrue("The table directory " + tableDir + " was not found", tableDir.isDirectory());
         for (File file : tableDir.tryList())
-        {
             copyFile(cfDir, file);
-        }
     }
 
     private static File getTableDir(String legacyVersion, String table)
@@ -691,17 +797,22 @@ public class LegacySSTableTest
     }
 
     public static void copyFile(File cfDir, File file) throws IOException
+    {
+        copyFile(cfDir, file,  new File(cfDir, file.name()));
+    }
+
+    public static void copyFile(File cfDir, File file, File target) throws IOException
     {
         byte[] buf = new byte[65536];
         if (file.isFile())
         {
-            File target = new File(cfDir, file.name());
             int rd;
             try (FileInputStreamPlus is = new FileInputStreamPlus(file);
-                 FileOutputStreamPlus os = new FileOutputStreamPlus(target);) {
+                 FileOutputStreamPlus os = new FileOutputStreamPlus(target);)
+            {
                 while ((rd = is.read(buf)) >= 0)
                     os.write(buf, 0, rd);
-                }
+            }
         }
     }
 }
diff --git a/test/unit/org/apache/cassandra/tools/SSTablePartitionsTest.java b/test/unit/org/apache/cassandra/tools/SSTablePartitionsTest.java
index 7899a79341..bd38139001 100644
--- a/test/unit/org/apache/cassandra/tools/SSTablePartitionsTest.java
+++ b/test/unit/org/apache/cassandra/tools/SSTablePartitionsTest.java
@@ -41,12 +41,12 @@ public class SSTablePartitionsTest extends OfflineToolUtils
 {
     private static final String SSTABLE_1 = sstable("legacy_ma_simple");
     private static final String SSTABLE_2 = sstable("legacy_ma_clust");
-    private static final String HEADER_1 = "\nProcessing  #1 (big-ma) (173 B uncompressed, 88 B on disk)\n";
-    private static final String HEADER_2 = "\nProcessing  #1 (big-ma) (328.145 KiB uncompressed, 5.096 KiB on disk)\n";
-    private static final String BACKUPS_HEADER_1 = "\nProcessing Backup:backups  #1 (big-ma) (173 B uncompressed, 88 B on disk)\n";
-    private static final String BACKUPS_HEADER_2 = "\nProcessing Backup:backups  #1 (big-ma) (328.145 KiB uncompressed, 5.096 KiB on disk)\n";
-    private static final String SNAPSHOTS_HEADER_1 = "\nProcessing Snapshot:snapshot-1  #1 (big-ma) (173 B uncompressed, 88 B on disk)\n";
-    private static final String SNAPSHOTS_HEADER_2 = "\nProcessing Snapshot:snapshot-1  #1 (big-ma) (328.145 KiB uncompressed, 5.096 KiB on disk)\n";
+    private static final String HEADER_1 = "\nProcessing  #306 (big-ma) (173 B uncompressed, 88 B on disk)\n";
+    private static final String HEADER_2 = "\nProcessing  #306 (big-ma) (328.145 KiB uncompressed, 5.096 KiB on disk)\n";
+    private static final String BACKUPS_HEADER_1 = "\nProcessing Backup:backups  #306 (big-ma) (173 B uncompressed, 88 B on disk)\n";
+    private static final String BACKUPS_HEADER_2 = "\nProcessing Backup:backups  #306 (big-ma) (328.145 KiB uncompressed, 5.096 KiB on disk)\n";
+    private static final String SNAPSHOTS_HEADER_1 = "\nProcessing Snapshot:snapshot-1  #306 (big-ma) (173 B uncompressed, 88 B on disk)\n";
+    private static final String SNAPSHOTS_HEADER_2 = "\nProcessing Snapshot:snapshot-1  #306 (big-ma) (328.145 KiB uncompressed, 5.096 KiB on disk)\n";
     private static final String SUMMARY_1 = "               Partition size            Row count           Cell count      Tombstone count\n" +
                                             "  ~p50                   35 B                    1                    1                    0\n" +
                                             "  ~p75                   35 B                    1                    1                    0\n" +
@@ -251,7 +251,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -261,7 +261,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_1 + "\n" +
                            "  4 partitions match\n" +
                            "  Keys: 1 2 3 4\n" +
@@ -274,7 +274,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -286,7 +286,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  4 partitions match\n" +
                            "  Keys: 1 2 3 4\n" +
@@ -298,7 +298,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  4 partitions match\n" +
                            "  Keys: 1 2 3 4\n" +
@@ -311,7 +311,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -337,7 +337,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -348,7 +348,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_1 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -361,7 +361,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -391,7 +391,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -402,7 +402,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_1 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -415,7 +415,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -445,7 +445,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 65.630 KiB, rows: 50, cells: 50, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_2 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -456,7 +456,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '2' (32) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_1 + "\n" +
                            "  5 partitions match\n" +
                            "  Keys: 0 1 2 3 4\n" +
@@ -536,7 +536,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                 .contains(HEADER_1 +
                            "  Partition: '1' (31) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_1 + "\n" +
                            "  2 partitions match\n" +
                            "  Keys: 1 3\n")
@@ -547,7 +547,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                           "  Partition: '0' (30) live, size: 33 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                           "  Partition: '2' (32) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                           "  Partition: '4' (34) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                          "Summary of  #1 (big-ma):\n" +
+                          "Summary of  #306 (big-ma):\n" +
                           "  File: " + SSTABLE_1 + "\n" +
                           "  3 partitions match\n" +
                           "  Keys: 0 2 4\n")
@@ -558,7 +558,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                           "  Partition: '0' (30) live, size: 33 B\n" +
                           "  Partition: '2' (32) live, size: 35 B\n" +
                           "  Partition: '4' (34) live, size: 35 B\n" +
-                          "Summary of  #1 (big-ma):\n" +
+                          "Summary of  #306 (big-ma):\n" +
                           "  File: " + SSTABLE_1 + "\n" +
                           "  3 partitions match\n" +
                           "  Keys: 0 2 4\n")
@@ -582,7 +582,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                            "  Partition: '0' (30) live, size: 33 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '2' (32) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '4' (34) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_1 + "\n" +
                            "  3 partitions match\n" +
                            "  Keys: 0 2 4\n")
@@ -592,7 +592,7 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                 .contains(HEADER_1 +
                            "  Partition: '1' (31) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
                            "  Partition: '3' (33) live, size: 35 B, rows: 1, cells: 1, tombstones: 0 (row:0, range:0, complex:0, cell:0, row-TTLd:0, cell-TTLd:0)\n" +
-                           "Summary of  #1 (big-ma):\n" +
+                           "Summary of  #306 (big-ma):\n" +
                            "  File: " + SSTABLE_1 + "\n" +
                            "  2 partitions match\n" +
                            "  Keys: 1 3\n")
@@ -616,15 +616,15 @@ public class SSTablePartitionsTest extends OfflineToolUtils
                                   "rowTombstoneCount,rangeTombstoneCount,complexTombstoneCount,cellTombstoneCount," +
                                   "rowTtlExpired,cellTtlExpired,directory,keyspace,table,index,snapshot,backup," +
                                   "generation,format,version\n" +
-                                  "\"0\",30,true,0,67200,50,50,0,0,0,0,0,0,0,%s,,,,,,1,big,ma\n" +
-                                  "\"1\",31,true,67200,67205,50,50,0,0,0,0,0,0,0,%<s,,,,,,1,big,ma\n" +
-                                  "\"2\",32,true,134405,67205,50,50,0,0,0,0,0,0,0,%<s,,,,,,1,big,ma\n" +
-                                  "\"3\",33,true,201610,67205,50,50,0,0,0,0,0,0,0,%<s,,,,,,1,big,ma\n" +
-                                  "\"4\",34,true,268815,67205,50,50,0,0,0,0,0,0,0,%<s,,,,,,1,big,ma\n" +
-                                  "\"1\",31,true,33,35,1,1,0,0,0,0,0,0,0,%s,,,,,,1,big,ma\n" +
-                                  "\"2\",32,true,68,35,1,1,0,0,0,0,0,0,0,%<s,,,,,,1,big,ma\n" +
-                                  "\"3\",33,true,103,35,1,1,0,0,0,0,0,0,0,%<s,,,,,,1,big,ma\n" +
-                                  "\"4\",34,true,138,35,1,1,0,0,0,0,0,0,0,%<s,,,,,,1,big,ma\n",
+                                  "\"0\",30,true,0,67200,50,50,0,0,0,0,0,0,0,%s,,,,,,306,big,ma\n" +
+                                  "\"1\",31,true,67200,67205,50,50,0,0,0,0,0,0,0,%<s,,,,,,306,big,ma\n" +
+                                  "\"2\",32,true,134405,67205,50,50,0,0,0,0,0,0,0,%<s,,,,,,306,big,ma\n" +
+                                  "\"3\",33,true,201610,67205,50,50,0,0,0,0,0,0,0,%<s,,,,,,306,big,ma\n" +
+                                  "\"4\",34,true,268815,67205,50,50,0,0,0,0,0,0,0,%<s,,,,,,306,big,ma\n" +
+                                  "\"1\",31,true,33,35,1,1,0,0,0,0,0,0,0,%s,,,,,,306,big,ma\n" +
+                                  "\"2\",32,true,68,35,1,1,0,0,0,0,0,0,0,%<s,,,,,,306,big,ma\n" +
+                                  "\"3\",33,true,103,35,1,1,0,0,0,0,0,0,0,%<s,,,,,,306,big,ma\n" +
+                                  "\"4\",34,true,138,35,1,1,0,0,0,0,0,0,0,%<s,,,,,,306,big,ma\n",
                                   SSTABLE_2, SSTABLE_1));
     }
 
diff --git a/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java b/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java
index d50e408d4d..c34d4a12cc 100644
--- a/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java
+++ b/test/unit/org/apache/cassandra/utils/concurrent/RefCountedTest.java
@@ -515,7 +515,7 @@ public class RefCountedTest
     {
         DatabaseDescriptor.clientInitialization();
         DatabaseDescriptor.setPartitionerUnsafe(ByteOrderedPartitioner.instance);
-        Descriptor descriptor = Descriptor.fromFileWithComponent(new File("test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Data.db"), false).left;
+        Descriptor descriptor = Descriptor.fromFileWithComponent(new File("test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-400-big-Data.db"), false).left;
         TableMetadata tm = TableMetadata.builder("legacy_tables", "legacy_nb_simple").addPartitionKeyColumn("pk", UTF8Type.instance).addRegularColumn("val", UTF8Type.instance).build();
         AtomicBoolean leakDetected = new AtomicBoolean();
         AtomicBoolean runOnCloseExecuted1 = new AtomicBoolean();