diff --git a/gix-archive/tests/fixtures/generated-archives/.gitignore b/gix-archive/tests/fixtures/generated-archives/.gitignore
index 830f66340cb..4eedfdcd6fe 100644
--- a/gix-archive/tests/fixtures/generated-archives/.gitignore
+++ b/gix-archive/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-basic.tar.xz
+basic.tar
diff --git a/gix-attributes/tests/fixtures/generated-archives/.gitignore b/gix-attributes/tests/fixtures/generated-archives/.gitignore
index fe98b6aba80..11995af120e 100644
--- a/gix-attributes/tests/fixtures/generated-archives/.gitignore
+++ b/gix-attributes/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-make_attributes_baseline.tar.xz
+make_attributes_baseline.tar
diff --git a/gix-command/tests/fixtures/generated-archives/.gitignore b/gix-command/tests/fixtures/generated-archives/.gitignore
index 1e42ce63faa..c470551ca87 100644
--- a/gix-command/tests/fixtures/generated-archives/.gitignore
+++ b/gix-command/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-win_path_lookup.tar.xz
+win_path_lookup.tar
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar b/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar
new file mode 100644
index 00000000000..396b512951c
Binary files /dev/null and b/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar.xz
deleted file mode 100644
index cdf5916afd8..00000000000
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/generation_number_overflow.tar.xz and /dev/null differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar b/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar
new file mode 100644
index 00000000000..0c80962befd
Binary files /dev/null and b/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar.xz
deleted file mode 100644
index 159d76d1dd2..00000000000
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/octopus_merges.tar.xz and /dev/null differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar b/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar
new file mode 100644
index 00000000000..88f6502272c
Binary files /dev/null and b/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar.xz
deleted file mode 100644
index 43986a0a812..00000000000
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/single_commit.tar.xz and /dev/null differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar b/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar
new file mode 100644
index 00000000000..dd10de768d0
Binary files /dev/null and b/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar.xz
deleted file mode 100644
index 95657e6f1a8..00000000000
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/single_commit_huge_dates.tar.xz and /dev/null differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar b/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar
new file mode 100644
index 00000000000..a3bf7835825
Binary files /dev/null and b/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar.xz
deleted file mode 100644
index dbec6da6322..00000000000
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/single_parent.tar.xz and /dev/null differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_parent_huge_dates.tar b/gix-commitgraph/tests/fixtures/generated-archives/single_parent_huge_dates.tar
new file mode 100644
index 00000000000..66a4e84bd30
Binary files /dev/null and b/gix-commitgraph/tests/fixtures/generated-archives/single_parent_huge_dates.tar differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/single_parent_huge_dates.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/single_parent_huge_dates.tar.xz
deleted file mode 100644
index 48dee65af23..00000000000
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/single_parent_huge_dates.tar.xz and /dev/null differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar b/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar
new file mode 100644
index 00000000000..df977d361f3
Binary files /dev/null and b/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar differ
diff --git a/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar.xz b/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar.xz
deleted file mode 100644
index 98f7748f120..00000000000
Binary files a/gix-commitgraph/tests/fixtures/generated-archives/two_parents.tar.xz and /dev/null differ
diff --git a/gix-config/tests/fixtures/generated-archives/.gitignore b/gix-config/tests/fixtures/generated-archives/.gitignore
index aca5621b76a..b9bcb76bde1 100644
--- a/gix-config/tests/fixtures/generated-archives/.gitignore
+++ b/gix-config/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-/make_config_repo.tar.xz
+/make_config_repo.tar
diff --git a/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar b/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar
new file mode 100644
index 00000000000..65cf59d3888
Binary files /dev/null and b/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar differ
diff --git a/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar.xz b/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar.xz
deleted file mode 100644
index 55ed10a225c..00000000000
Binary files a/gix-config/tests/fixtures/generated-archives/config_with_worktree_extension.tar.xz and /dev/null differ
diff --git a/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar b/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar
new file mode 100644
index 00000000000..aced50eb9d7
Binary files /dev/null and b/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar differ
diff --git a/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar.xz b/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar.xz
deleted file mode 100644
index 1ac61488236..00000000000
Binary files a/gix-date/tests/fixtures/generated-archives/generate_git_date_baseline.tar.xz and /dev/null differ
diff --git a/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar b/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar
new file mode 100644
index 00000000000..be3dd944f55
Binary files /dev/null and b/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar differ
diff --git a/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar.xz b/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar.xz
deleted file mode 100644
index 085dac5c3f7..00000000000
Binary files a/gix-diff/tests/fixtures/generated-archives/make_blob_repo.tar.xz and /dev/null differ
diff --git a/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar b/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar
new file mode 100644
index 00000000000..b6cf505cc4c
Binary files /dev/null and b/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar differ
diff --git a/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar.xz b/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar.xz
deleted file mode 100644
index 2602d5df03c..00000000000
Binary files a/gix-diff/tests/fixtures/generated-archives/make_diff_repo.tar.xz and /dev/null differ
diff --git a/gix-dir/tests/fixtures/generated-archives/.gitignore b/gix-dir/tests/fixtures/generated-archives/.gitignore
index 028ec685db4..75186c14a92 100644
--- a/gix-dir/tests/fixtures/generated-archives/.gitignore
+++ b/gix-dir/tests/fixtures/generated-archives/.gitignore
@@ -1,2 +1,2 @@
-many.tar.xz
-many-symlinks.tar.xz
\ No newline at end of file
+many.tar
+many-symlinks.tar
\ No newline at end of file
diff --git a/gix-discover/tests/fixtures/generated-archives/.gitignore b/gix-discover/tests/fixtures/generated-archives/.gitignore
index 38e949205e5..4d87093674d 100644
--- a/gix-discover/tests/fixtures/generated-archives/.gitignore
+++ b/gix-discover/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-/make_basic_repo.tar.xz
+/make_basic_repo.tar
diff --git a/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar b/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar
new file mode 100644
index 00000000000..8933b2b19f7
Binary files /dev/null and b/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar differ
diff --git a/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar.xz b/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar.xz
deleted file mode 100644
index 9f70a620482..00000000000
Binary files a/gix-discover/tests/fixtures/generated-archives/make_exfat_repo_darwin.tar.xz and /dev/null differ
diff --git a/gix-discover/tests/fixtures/generated-archives/make_submodules.tar b/gix-discover/tests/fixtures/generated-archives/make_submodules.tar
new file mode 100644
index 00000000000..4153412e386
Binary files /dev/null and b/gix-discover/tests/fixtures/generated-archives/make_submodules.tar differ
diff --git a/gix-discover/tests/fixtures/generated-archives/make_submodules.tar.xz b/gix-discover/tests/fixtures/generated-archives/make_submodules.tar.xz
deleted file mode 100644
index 98f4c73ea35..00000000000
Binary files a/gix-discover/tests/fixtures/generated-archives/make_submodules.tar.xz and /dev/null differ
diff --git a/gix-filter/tests/fixtures/generated-archives/.gitignore b/gix-filter/tests/fixtures/generated-archives/.gitignore
index 367a3ceba7b..98d509e5adb 100644
--- a/gix-filter/tests/fixtures/generated-archives/.gitignore
+++ b/gix-filter/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-/baseline.tar.xz
+/baseline.tar
diff --git a/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar b/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar
new file mode 100644
index 00000000000..f23c77d2c86
Binary files /dev/null and b/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar differ
diff --git a/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar.xz b/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar.xz
deleted file mode 100644
index 549b249f39e..00000000000
Binary files a/gix-filter/tests/fixtures/generated-archives/pipeline_repos.tar.xz and /dev/null differ
diff --git a/gix-fsck/tests/fixtures/generated-archives/.gitignore b/gix-fsck/tests/fixtures/generated-archives/.gitignore
index d47a40f0345..b8d43aadf84 100644
--- a/gix-fsck/tests/fixtures/generated-archives/.gitignore
+++ b/gix-fsck/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-make_test_repos.tar.xz
+make_test_repos.tar
diff --git a/gix-glob/tests/fixtures/generated-archives/make_baseline.tar b/gix-glob/tests/fixtures/generated-archives/make_baseline.tar
new file mode 100644
index 00000000000..e487259fac0
Binary files /dev/null and b/gix-glob/tests/fixtures/generated-archives/make_baseline.tar differ
diff --git a/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz b/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz
deleted file mode 100644
index f7c19284c7e..00000000000
Binary files a/gix-glob/tests/fixtures/generated-archives/make_baseline.tar.xz and /dev/null differ
diff --git a/gix-ignore/tests/fixtures/generated-archives/.gitignore b/gix-ignore/tests/fixtures/generated-archives/.gitignore
index 1a25065876d..1ddbb9b32a7 100644
--- a/gix-ignore/tests/fixtures/generated-archives/.gitignore
+++ b/gix-ignore/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-make_global_and_external_and_dir_ignores.tar.xz
+make_global_and_external_and_dir_ignores.tar
diff --git a/gix-index/tests/fixtures/generated-archives/.gitignore b/gix-index/tests/fixtures/generated-archives/.gitignore
index 2aa72912595..22d2701fa68 100644
--- a/gix-index/tests/fixtures/generated-archives/.gitignore
+++ b/gix-index/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-file_metadata.tar.xz
\ No newline at end of file
+file_metadata.tar
\ No newline at end of file
diff --git a/gix-index/tests/fixtures/generated-archives/V2_empty.tar b/gix-index/tests/fixtures/generated-archives/V2_empty.tar
new file mode 100644
index 00000000000..543b094711d
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/V2_empty.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/V2_empty.tar.xz b/gix-index/tests/fixtures/generated-archives/V2_empty.tar.xz
deleted file mode 100644
index 70ddca8c48b..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/V2_empty.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/make_traverse_literal_separators.tar b/gix-index/tests/fixtures/generated-archives/make_traverse_literal_separators.tar
new file mode 100644
index 00000000000..927d96b2ac7
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/make_traverse_literal_separators.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/make_traverse_literal_separators.tar.xz b/gix-index/tests/fixtures/generated-archives/make_traverse_literal_separators.tar.xz
deleted file mode 100644
index f7b13684d75..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/make_traverse_literal_separators.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2.tar b/gix-index/tests/fixtures/generated-archives/v2.tar
new file mode 100644
index 00000000000..6f8f81fb133
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v2.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2.tar.xz b/gix-index/tests/fixtures/generated-archives/v2.tar.xz
deleted file mode 100644
index 143f40f7ddc..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v2.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar b/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar
new file mode 100644
index 00000000000..ad35bdb4a35
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar.xz
deleted file mode 100644
index a83ecec0af5..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v2_all_file_kinds.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_deeper_tree.tar b/gix-index/tests/fixtures/generated-archives/v2_deeper_tree.tar
new file mode 100644
index 00000000000..c5ec346f6f0
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v2_deeper_tree.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_deeper_tree.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_deeper_tree.tar.xz
deleted file mode 100644
index 83fb2cf26b7..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v2_deeper_tree.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar b/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar
new file mode 100644
index 00000000000..e208ffa5f03
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar.xz
deleted file mode 100644
index 17845f85aec..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v2_icase_name_clashes.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_more_files.tar b/gix-index/tests/fixtures/generated-archives/v2_more_files.tar
new file mode 100644
index 00000000000..26b6d1e50e2
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v2_more_files.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_more_files.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_more_files.tar.xz
deleted file mode 100644
index 68d730041aa..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v2_more_files.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar b/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar
new file mode 100644
index 00000000000..36829500c1f
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar.xz
deleted file mode 100644
index 556b8fa5a83..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v2_sparse_index_no_dirs.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_split_index.tar b/gix-index/tests/fixtures/generated-archives/v2_split_index.tar
new file mode 100644
index 00000000000..1efadced95c
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v2_split_index.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_split_index.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_split_index.tar.xz
deleted file mode 100644
index d666760516a..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v2_split_index.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar b/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar
new file mode 100644
index 00000000000..04e74347ec2
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar.xz
deleted file mode 100644
index 971200d51b9..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v2_split_index_recursive.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar b/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar
new file mode 100644
index 00000000000..3d6c45e8966
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar.xz b/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar.xz
deleted file mode 100644
index 4ba20b40755..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v2_split_vs_regular_index.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_added_files.tar b/gix-index/tests/fixtures/generated-archives/v3_added_files.tar
new file mode 100644
index 00000000000..0334ce0c955
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v3_added_files.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_added_files.tar.xz b/gix-index/tests/fixtures/generated-archives/v3_added_files.tar.xz
deleted file mode 100644
index 9859e878710..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v3_added_files.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar b/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar
new file mode 100644
index 00000000000..a65a1f53add
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar.xz b/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar.xz
deleted file mode 100644
index 2aef44263a2..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v3_skip_worktree.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar b/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar
new file mode 100644
index 00000000000..5d3de77a3a3
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar.xz b/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar.xz
deleted file mode 100644
index 58a29bb4174..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v3_sparse_index.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar b/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar
new file mode 100644
index 00000000000..3e38cb09b6b
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar.xz b/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar.xz
deleted file mode 100644
index 1209c847522..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v3_sparse_index_non_cone.tar.xz and /dev/null differ
diff --git a/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar b/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar
new file mode 100644
index 00000000000..c024517a9b8
Binary files /dev/null and b/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar differ
diff --git a/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar.xz b/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar.xz
deleted file mode 100644
index 72c6cd5c119..00000000000
Binary files a/gix-index/tests/fixtures/generated-archives/v4_more_files_IEOT.tar.xz and /dev/null differ
diff --git a/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar b/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar
new file mode 100644
index 00000000000..01687eac201
Binary files /dev/null and b/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar differ
diff --git a/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz b/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz
deleted file mode 100644
index 2a0799c3ea3..00000000000
Binary files a/gix-negotiate/tests/fixtures/generated-archives/make_repos.tar.xz and /dev/null differ
diff --git a/gix-object/tests/fixtures/generated-archives/make_trees.tar b/gix-object/tests/fixtures/generated-archives/make_trees.tar
new file mode 100644
index 00000000000..d5eb22a58fc
Binary files /dev/null and b/gix-object/tests/fixtures/generated-archives/make_trees.tar differ
diff --git a/gix-object/tests/fixtures/generated-archives/make_trees.tar.xz b/gix-object/tests/fixtures/generated-archives/make_trees.tar.xz
deleted file mode 100644
index 5e42731caba..00000000000
Binary files a/gix-object/tests/fixtures/generated-archives/make_trees.tar.xz and /dev/null differ
diff --git a/gix-odb/tests/fixtures/generated-archives/.gitignore b/gix-odb/tests/fixtures/generated-archives/.gitignore
index 4d1ab0373bb..013922e7d4e 100644
--- a/gix-odb/tests/fixtures/generated-archives/.gitignore
+++ b/gix-odb/tests/fixtures/generated-archives/.gitignore
@@ -1,2 +1,2 @@
-repo_with_loose_objects.tar.xz
-make_alternates_odb.tar.xz
+repo_with_loose_objects.tar
+make_alternates_odb.tar
diff --git a/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar b/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar
new file mode 100644
index 00000000000..2a2b7fc6599
Binary files /dev/null and b/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar differ
diff --git a/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar.xz b/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar.xz
deleted file mode 100644
index a30dfd02a15..00000000000
Binary files a/gix-odb/tests/fixtures/generated-archives/make_replaced_history.tar.xz and /dev/null differ
diff --git a/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar b/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar
new file mode 100644
index 00000000000..af4e3c9f803
Binary files /dev/null and b/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar differ
diff --git a/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar.xz b/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar.xz
deleted file mode 100644
index 03c2e9c071f..00000000000
Binary files a/gix-odb/tests/fixtures/generated-archives/make_repo_multi_index.tar.xz and /dev/null differ
diff --git a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar
new file mode 100644
index 00000000000..c14f73b0ed0
Binary files /dev/null and b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar differ
diff --git a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar.xz b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar.xz
deleted file mode 100644
index 5c209dc3d51..00000000000
Binary files a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo.tar.xz and /dev/null differ
diff --git a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar
new file mode 100644
index 00000000000..51157c4745b
Binary files /dev/null and b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar differ
diff --git a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar.xz b/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar.xz
deleted file mode 100644
index f3d16ee0d90..00000000000
Binary files a/gix-pack/tests/fixtures/generated-archives/make_pack_gen_repo_multi_index.tar.xz and /dev/null differ
diff --git a/gix-pathspec/tests/fixtures/generated-archives/match_baseline.tar b/gix-pathspec/tests/fixtures/generated-archives/match_baseline.tar
new file mode 100644
index 00000000000..36a2cf70a4d
Binary files /dev/null and b/gix-pathspec/tests/fixtures/generated-archives/match_baseline.tar differ
diff --git a/gix-pathspec/tests/fixtures/generated-archives/match_baseline.tar.xz b/gix-pathspec/tests/fixtures/generated-archives/match_baseline.tar.xz
deleted file mode 100644
index 2121b5579ce..00000000000
Binary files a/gix-pathspec/tests/fixtures/generated-archives/match_baseline.tar.xz and /dev/null differ
diff --git a/gix-pathspec/tests/fixtures/generated-archives/match_baseline_dirs.tar b/gix-pathspec/tests/fixtures/generated-archives/match_baseline_dirs.tar
new file mode 100644
index 00000000000..3130e01d2af
Binary files /dev/null and b/gix-pathspec/tests/fixtures/generated-archives/match_baseline_dirs.tar differ
diff --git a/gix-pathspec/tests/fixtures/generated-archives/match_baseline_dirs.tar.xz b/gix-pathspec/tests/fixtures/generated-archives/match_baseline_dirs.tar.xz
deleted file mode 100644
index 702a31f3315..00000000000
Binary files a/gix-pathspec/tests/fixtures/generated-archives/match_baseline_dirs.tar.xz and /dev/null differ
diff --git a/gix-pathspec/tests/fixtures/generated-archives/match_baseline_files.tar b/gix-pathspec/tests/fixtures/generated-archives/match_baseline_files.tar
new file mode 100644
index 00000000000..11e44ce55e5
Binary files /dev/null and b/gix-pathspec/tests/fixtures/generated-archives/match_baseline_files.tar differ
diff --git a/gix-pathspec/tests/fixtures/generated-archives/match_baseline_files.tar.xz b/gix-pathspec/tests/fixtures/generated-archives/match_baseline_files.tar.xz
deleted file mode 100644
index 2f94c5126f3..00000000000
Binary files a/gix-pathspec/tests/fixtures/generated-archives/match_baseline_files.tar.xz and /dev/null differ
diff --git a/gix-pathspec/tests/fixtures/generated-archives/parse_baseline.tar b/gix-pathspec/tests/fixtures/generated-archives/parse_baseline.tar
new file mode 100644
index 00000000000..9b4b13b3b8b
Binary files /dev/null and b/gix-pathspec/tests/fixtures/generated-archives/parse_baseline.tar differ
diff --git a/gix-pathspec/tests/fixtures/generated-archives/parse_baseline.tar.xz b/gix-pathspec/tests/fixtures/generated-archives/parse_baseline.tar.xz
deleted file mode 100644
index 5825e1233cf..00000000000
Binary files a/gix-pathspec/tests/fixtures/generated-archives/parse_baseline.tar.xz and /dev/null differ
diff --git a/gix-ref/tests/fixtures/generated-archives/.gitignore b/gix-ref/tests/fixtures/generated-archives/.gitignore
index ed119b42480..69e13d8ecc4 100644
--- a/gix-ref/tests/fixtures/generated-archives/.gitignore
+++ b/gix-ref/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-make_worktree_repo.tar.xz
+make_worktree_repo.tar
diff --git a/gix-ref/tests/fixtures/generated-archives/make_namespaced_packed_ref_repository.tar b/gix-ref/tests/fixtures/generated-archives/make_namespaced_packed_ref_repository.tar
new file mode 100644
index 00000000000..9f7d0bef82d
Binary files /dev/null and b/gix-ref/tests/fixtures/generated-archives/make_namespaced_packed_ref_repository.tar differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_namespaced_packed_ref_repository.tar.xz b/gix-ref/tests/fixtures/generated-archives/make_namespaced_packed_ref_repository.tar.xz
deleted file mode 100644
index fc978af675a..00000000000
Binary files a/gix-ref/tests/fixtures/generated-archives/make_namespaced_packed_ref_repository.tar.xz and /dev/null differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository.tar b/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository.tar
new file mode 100644
index 00000000000..9c2bc2ea2b9
Binary files /dev/null and b/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository.tar differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository.tar.xz b/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository.tar.xz
deleted file mode 100644
index b6b0a26f118..00000000000
Binary files a/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository.tar.xz and /dev/null differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository_for_overlay.tar b/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository_for_overlay.tar
new file mode 100644
index 00000000000..e46ce16be89
Binary files /dev/null and b/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository_for_overlay.tar differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository_for_overlay.tar.xz b/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository_for_overlay.tar.xz
deleted file mode 100644
index 9854c8a8585..00000000000
Binary files a/gix-ref/tests/fixtures/generated-archives/make_packed_ref_repository_for_overlay.tar.xz and /dev/null differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_packed_refs_for_lookup_rules.tar b/gix-ref/tests/fixtures/generated-archives/make_packed_refs_for_lookup_rules.tar
new file mode 100644
index 00000000000..66fc39f6910
Binary files /dev/null and b/gix-ref/tests/fixtures/generated-archives/make_packed_refs_for_lookup_rules.tar differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_packed_refs_for_lookup_rules.tar.xz b/gix-ref/tests/fixtures/generated-archives/make_packed_refs_for_lookup_rules.tar.xz
deleted file mode 100644
index d0d97268a46..00000000000
Binary files a/gix-ref/tests/fixtures/generated-archives/make_packed_refs_for_lookup_rules.tar.xz and /dev/null differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_ref_repository.tar b/gix-ref/tests/fixtures/generated-archives/make_ref_repository.tar
new file mode 100644
index 00000000000..ae58c4f1ab5
Binary files /dev/null and b/gix-ref/tests/fixtures/generated-archives/make_ref_repository.tar differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_ref_repository.tar.xz b/gix-ref/tests/fixtures/generated-archives/make_ref_repository.tar.xz
deleted file mode 100644
index 219c6d3262e..00000000000
Binary files a/gix-ref/tests/fixtures/generated-archives/make_ref_repository.tar.xz and /dev/null differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_repo_for_reflog.tar b/gix-ref/tests/fixtures/generated-archives/make_repo_for_reflog.tar
new file mode 100644
index 00000000000..7ea837eb599
Binary files /dev/null and b/gix-ref/tests/fixtures/generated-archives/make_repo_for_reflog.tar differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_repo_for_reflog.tar.xz b/gix-ref/tests/fixtures/generated-archives/make_repo_for_reflog.tar.xz
deleted file mode 100644
index 94b394600e9..00000000000
Binary files a/gix-ref/tests/fixtures/generated-archives/make_repo_for_reflog.tar.xz and /dev/null differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_repository_with_lots_of_packed_refs.tar b/gix-ref/tests/fixtures/generated-archives/make_repository_with_lots_of_packed_refs.tar
new file mode 100644
index 00000000000..6b2839bb0fb
Binary files /dev/null and b/gix-ref/tests/fixtures/generated-archives/make_repository_with_lots_of_packed_refs.tar differ
diff --git a/gix-ref/tests/fixtures/generated-archives/make_repository_with_lots_of_packed_refs.tar.xz b/gix-ref/tests/fixtures/generated-archives/make_repository_with_lots_of_packed_refs.tar.xz
deleted file mode 100644
index d9a682025f6..00000000000
Binary files a/gix-ref/tests/fixtures/generated-archives/make_repository_with_lots_of_packed_refs.tar.xz and /dev/null differ
diff --git a/gix-refspec/tests/fixtures/generated-archives/.gitignore b/gix-refspec/tests/fixtures/generated-archives/.gitignore
index 6d9f4282261..a0362db6e0d 100644
--- a/gix-refspec/tests/fixtures/generated-archives/.gitignore
+++ b/gix-refspec/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-/match_baseline.tar.xz
+/match_baseline.tar
diff --git a/gix-refspec/tests/fixtures/generated-archives/parse_baseline.tar b/gix-refspec/tests/fixtures/generated-archives/parse_baseline.tar
new file mode 100644
index 00000000000..e4e9d91d737
Binary files /dev/null and b/gix-refspec/tests/fixtures/generated-archives/parse_baseline.tar differ
diff --git a/gix-refspec/tests/fixtures/generated-archives/parse_baseline.tar.xz b/gix-refspec/tests/fixtures/generated-archives/parse_baseline.tar.xz
deleted file mode 100644
index 9751ce7c3cb..00000000000
Binary files a/gix-refspec/tests/fixtures/generated-archives/parse_baseline.tar.xz and /dev/null differ
diff --git a/gix-revision/tests/fixtures/generated-archives/make_repo_with_branches.tar b/gix-revision/tests/fixtures/generated-archives/make_repo_with_branches.tar
new file mode 100644
index 00000000000..bd67e083364
Binary files /dev/null and b/gix-revision/tests/fixtures/generated-archives/make_repo_with_branches.tar differ
diff --git a/gix-revision/tests/fixtures/generated-archives/make_repo_with_branches.tar.xz b/gix-revision/tests/fixtures/generated-archives/make_repo_with_branches.tar.xz
deleted file mode 100644
index a10c1182691..00000000000
Binary files a/gix-revision/tests/fixtures/generated-archives/make_repo_with_branches.tar.xz and /dev/null differ
diff --git a/gix-status/tests/fixtures/generated-archives/.gitignore b/gix-status/tests/fixtures/generated-archives/.gitignore
index c0de66a1edd..54c8e16e9b6 100644
--- a/gix-status/tests/fixtures/generated-archives/.gitignore
+++ b/gix-status/tests/fixtures/generated-archives/.gitignore
@@ -1,3 +1,3 @@
-status_unchanged.tar.xz
-status_changed.tar.xz
-symlink_stack.tar.xz
+status_unchanged.tar
+status_changed.tar
+symlink_stack.tar
diff --git a/gix-status/tests/fixtures/generated-archives/conflicts.tar b/gix-status/tests/fixtures/generated-archives/conflicts.tar
new file mode 100644
index 00000000000..c35b37213be
Binary files /dev/null and b/gix-status/tests/fixtures/generated-archives/conflicts.tar differ
diff --git a/gix-status/tests/fixtures/generated-archives/conflicts.tar.xz b/gix-status/tests/fixtures/generated-archives/conflicts.tar.xz
deleted file mode 100644
index 8b133639543..00000000000
Binary files a/gix-status/tests/fixtures/generated-archives/conflicts.tar.xz and /dev/null differ
diff --git a/gix-status/tests/fixtures/generated-archives/racy_git.tar b/gix-status/tests/fixtures/generated-archives/racy_git.tar
new file mode 100644
index 00000000000..a263950ad7c
Binary files /dev/null and b/gix-status/tests/fixtures/generated-archives/racy_git.tar differ
diff --git a/gix-status/tests/fixtures/generated-archives/racy_git.tar.xz b/gix-status/tests/fixtures/generated-archives/racy_git.tar.xz
deleted file mode 100644
index ba629301894..00000000000
Binary files a/gix-status/tests/fixtures/generated-archives/racy_git.tar.xz and /dev/null differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_conflict.tar b/gix-status/tests/fixtures/generated-archives/status_conflict.tar
new file mode 100644
index 00000000000..98156846fd1
Binary files /dev/null and b/gix-status/tests/fixtures/generated-archives/status_conflict.tar differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_conflict.tar.xz b/gix-status/tests/fixtures/generated-archives/status_conflict.tar.xz
deleted file mode 100644
index 9f05ea3d774..00000000000
Binary files a/gix-status/tests/fixtures/generated-archives/status_conflict.tar.xz and /dev/null differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_intent_to_add.tar b/gix-status/tests/fixtures/generated-archives/status_intent_to_add.tar
new file mode 100644
index 00000000000..2c8ad154e94
Binary files /dev/null and b/gix-status/tests/fixtures/generated-archives/status_intent_to_add.tar differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_intent_to_add.tar.xz b/gix-status/tests/fixtures/generated-archives/status_intent_to_add.tar.xz
deleted file mode 100644
index 4d555d42754..00000000000
Binary files a/gix-status/tests/fixtures/generated-archives/status_intent_to_add.tar.xz and /dev/null differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_many.tar b/gix-status/tests/fixtures/generated-archives/status_many.tar
new file mode 100644
index 00000000000..91dd6a9110f
Binary files /dev/null and b/gix-status/tests/fixtures/generated-archives/status_many.tar differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_many.tar.xz b/gix-status/tests/fixtures/generated-archives/status_many.tar.xz
deleted file mode 100644
index 208a5af7fa0..00000000000
Binary files a/gix-status/tests/fixtures/generated-archives/status_many.tar.xz and /dev/null differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_removed.tar b/gix-status/tests/fixtures/generated-archives/status_removed.tar
new file mode 100644
index 00000000000..1828e56b980
Binary files /dev/null and b/gix-status/tests/fixtures/generated-archives/status_removed.tar differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_removed.tar.xz b/gix-status/tests/fixtures/generated-archives/status_removed.tar.xz
deleted file mode 100644
index b708ee74a47..00000000000
Binary files a/gix-status/tests/fixtures/generated-archives/status_removed.tar.xz and /dev/null differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_submodule.tar b/gix-status/tests/fixtures/generated-archives/status_submodule.tar
new file mode 100644
index 00000000000..0ad307704fd
Binary files /dev/null and b/gix-status/tests/fixtures/generated-archives/status_submodule.tar differ
diff --git a/gix-status/tests/fixtures/generated-archives/status_submodule.tar.xz b/gix-status/tests/fixtures/generated-archives/status_submodule.tar.xz
deleted file mode 100644
index ca525710f26..00000000000
Binary files a/gix-status/tests/fixtures/generated-archives/status_submodule.tar.xz and /dev/null differ
diff --git a/gix-submodule/tests/fixtures/generated-archives/basic.tar b/gix-submodule/tests/fixtures/generated-archives/basic.tar
new file mode 100644
index 00000000000..200f6353541
Binary files /dev/null and b/gix-submodule/tests/fixtures/generated-archives/basic.tar differ
diff --git a/gix-submodule/tests/fixtures/generated-archives/basic.tar.xz b/gix-submodule/tests/fixtures/generated-archives/basic.tar.xz
deleted file mode 100644
index f9405c31df9..00000000000
Binary files a/gix-submodule/tests/fixtures/generated-archives/basic.tar.xz and /dev/null differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_repo_for_topo.tar b/gix-traverse/tests/fixtures/generated-archives/make_repo_for_topo.tar
new file mode 100644
index 00000000000..5f8d455357a
Binary files /dev/null and b/gix-traverse/tests/fixtures/generated-archives/make_repo_for_topo.tar differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_repo_for_topo.tar.xz b/gix-traverse/tests/fixtures/generated-archives/make_repo_for_topo.tar.xz
deleted file mode 100644
index 0eef69ea66b..00000000000
Binary files a/gix-traverse/tests/fixtures/generated-archives/make_repo_for_topo.tar.xz and /dev/null differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_repos.tar b/gix-traverse/tests/fixtures/generated-archives/make_repos.tar
new file mode 100644
index 00000000000..4cf3b1c9132
Binary files /dev/null and b/gix-traverse/tests/fixtures/generated-archives/make_repos.tar differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_repos.tar.xz b/gix-traverse/tests/fixtures/generated-archives/make_repos.tar.xz
deleted file mode 100644
index 78cb114dd15..00000000000
Binary files a/gix-traverse/tests/fixtures/generated-archives/make_repos.tar.xz and /dev/null differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_same_date.tar b/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_same_date.tar
new file mode 100644
index 00000000000..7839f17db17
Binary files /dev/null and b/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_same_date.tar differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_same_date.tar.xz b/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_same_date.tar.xz
deleted file mode 100644
index 56e225f21a3..00000000000
Binary files a/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_same_date.tar.xz and /dev/null differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_with_dates.tar b/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_with_dates.tar
new file mode 100644
index 00000000000..65f89805847
Binary files /dev/null and b/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_with_dates.tar differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_with_dates.tar.xz b/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_with_dates.tar.xz
deleted file mode 100644
index b70153746a0..00000000000
Binary files a/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_commits_with_dates.tar.xz and /dev/null differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_trees.tar b/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_trees.tar
new file mode 100644
index 00000000000..c65b33bf004
Binary files /dev/null and b/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_trees.tar differ
diff --git a/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_trees.tar.xz b/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_trees.tar.xz
deleted file mode 100644
index 95689b4c983..00000000000
Binary files a/gix-traverse/tests/fixtures/generated-archives/make_traversal_repo_for_trees.tar.xz and /dev/null differ
diff --git a/gix-url/tests/fixtures/generated-archives/.gitignore b/gix-url/tests/fixtures/generated-archives/.gitignore
index b6a2ef57b09..3c29ddc1184 100644
--- a/gix-url/tests/fixtures/generated-archives/.gitignore
+++ b/gix-url/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-make_baseline.tar.xz
+make_baseline.tar
diff --git a/gix-worktree-state/tests/fixtures/generated-archives/.gitignore b/gix-worktree-state/tests/fixtures/generated-archives/.gitignore
index 31cfa1532e9..485ef607922 100644
--- a/gix-worktree-state/tests/fixtures/generated-archives/.gitignore
+++ b/gix-worktree-state/tests/fixtures/generated-archives/.gitignore
@@ -1,7 +1,7 @@
-make_ignore_and_attributes_setup.tar.xz
-make_mixed_without_submodules.tar.xz
-make_mixed.tar.xz
-make_mixed_without_submodules_and_symlinks.tar.xz
-make_attributes_baseline.tar.xz
-make_dangerous_symlink.tar.xz
-make_ignorecase_collisions.tar.xz
+make_ignore_and_attributes_setup.tar
+make_mixed_without_submodules.tar
+make_mixed.tar
+make_mixed_without_submodules_and_symlinks.tar
+make_attributes_baseline.tar
+make_dangerous_symlink.tar
+make_ignorecase_collisions.tar
diff --git a/gix-worktree-state/tests/fixtures/generated-archives/make_dangling_symlink.tar b/gix-worktree-state/tests/fixtures/generated-archives/make_dangling_symlink.tar
new file mode 100644
index 00000000000..b98a965b811
Binary files /dev/null and b/gix-worktree-state/tests/fixtures/generated-archives/make_dangling_symlink.tar differ
diff --git a/gix-worktree-state/tests/fixtures/generated-archives/make_dangling_symlink.tar.xz b/gix-worktree-state/tests/fixtures/generated-archives/make_dangling_symlink.tar.xz
deleted file mode 100644
index ffbcd148aa9..00000000000
Binary files a/gix-worktree-state/tests/fixtures/generated-archives/make_dangling_symlink.tar.xz and /dev/null differ
diff --git a/gix-worktree-state/tests/fixtures/generated-archives/make_traverse_trees.tar b/gix-worktree-state/tests/fixtures/generated-archives/make_traverse_trees.tar
new file mode 100644
index 00000000000..83a51f23bde
Binary files /dev/null and b/gix-worktree-state/tests/fixtures/generated-archives/make_traverse_trees.tar differ
diff --git a/gix-worktree-state/tests/fixtures/generated-archives/make_traverse_trees.tar.xz b/gix-worktree-state/tests/fixtures/generated-archives/make_traverse_trees.tar.xz
deleted file mode 100644
index fa5f898161f..00000000000
Binary files a/gix-worktree-state/tests/fixtures/generated-archives/make_traverse_trees.tar.xz and /dev/null differ
diff --git a/gix-worktree-stream/tests/fixtures/generated-archives/.gitignore b/gix-worktree-stream/tests/fixtures/generated-archives/.gitignore
index 830f66340cb..4eedfdcd6fe 100644
--- a/gix-worktree-stream/tests/fixtures/generated-archives/.gitignore
+++ b/gix-worktree-stream/tests/fixtures/generated-archives/.gitignore
@@ -1 +1 @@
-basic.tar.xz
+basic.tar
diff --git a/gix-worktree/tests/fixtures/generated-archives/.gitignore b/gix-worktree/tests/fixtures/generated-archives/.gitignore
index b39f9769fde..cc8e4a68d4e 100644
--- a/gix-worktree/tests/fixtures/generated-archives/.gitignore
+++ b/gix-worktree/tests/fixtures/generated-archives/.gitignore
@@ -1,3 +1,3 @@
-make_ignore_and_attributes_setup.tar.xz
-make_attributes_baseline.tar.xz
-symlink_stack.tar.xz
+make_ignore_and_attributes_setup.tar
+make_attributes_baseline.tar
+symlink_stack.tar
diff --git a/gix-worktree/tests/fixtures/generated-archives/make_special_exclude_case.tar b/gix-worktree/tests/fixtures/generated-archives/make_special_exclude_case.tar
new file mode 100644
index 00000000000..a0e6b7e502d
Binary files /dev/null and b/gix-worktree/tests/fixtures/generated-archives/make_special_exclude_case.tar differ
diff --git a/gix-worktree/tests/fixtures/generated-archives/make_special_exclude_case.tar.xz b/gix-worktree/tests/fixtures/generated-archives/make_special_exclude_case.tar.xz
deleted file mode 100644
index 6afa1984db6..00000000000
Binary files a/gix-worktree/tests/fixtures/generated-archives/make_special_exclude_case.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/.gitignore b/gix/tests/fixtures/generated-archives/.gitignore
index 7cf4c0941d5..ba11709c21a 100644
--- a/gix/tests/fixtures/generated-archives/.gitignore
+++ b/gix/tests/fixtures/generated-archives/.gitignore
@@ -1,7 +1,7 @@
-/make_worktree_repo.tar.xz
-/make_worktree_repo_with_configs.tar.xz
-/make_remote_repos.tar.xz
-/make_complex_shallow_repo.tar.xz
-/make_fetch_repos.tar.xz
-/make_core_worktree_repo.tar.xz
-/make_signatures_repo.tar.xz
+/make_worktree_repo.tar
+/make_worktree_repo_with_configs.tar
+/make_remote_repos.tar
+/make_complex_shallow_repo.tar
+/make_fetch_repos.tar
+/make_core_worktree_repo.tar
+/make_signatures_repo.tar
diff --git a/gix/tests/fixtures/generated-archives/make_am_repo.tar b/gix/tests/fixtures/generated-archives/make_am_repo.tar
new file mode 100644
index 00000000000..c943b2c856d
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_am_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_am_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_am_repo.tar.xz
deleted file mode 100644
index bd553de8cf3..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_am_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_basic_repo.tar b/gix/tests/fixtures/generated-archives/make_basic_repo.tar
new file mode 100644
index 00000000000..07621a94675
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_basic_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_basic_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_basic_repo.tar.xz
deleted file mode 100644
index c235a270b22..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_basic_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_bisect_repo.tar b/gix/tests/fixtures/generated-archives/make_bisect_repo.tar
new file mode 100644
index 00000000000..8c3fb485bbb
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_bisect_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_bisect_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_bisect_repo.tar.xz
deleted file mode 100644
index 3cdac406f9a..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_bisect_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_cherry_pick_repo.tar b/gix/tests/fixtures/generated-archives/make_cherry_pick_repo.tar
new file mode 100644
index 00000000000..9888a231777
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_cherry_pick_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_cherry_pick_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_cherry_pick_repo.tar.xz
deleted file mode 100644
index 3d6c9da34ce..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_cherry_pick_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_cherry_pick_sequence_repo.tar b/gix/tests/fixtures/generated-archives/make_cherry_pick_sequence_repo.tar
new file mode 100644
index 00000000000..ecb341336b7
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_cherry_pick_sequence_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_cherry_pick_sequence_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_cherry_pick_sequence_repo.tar.xz
deleted file mode 100644
index 0169ff12b6e..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_cherry_pick_sequence_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_commit_describe_multiple_tags.tar b/gix/tests/fixtures/generated-archives/make_commit_describe_multiple_tags.tar
new file mode 100644
index 00000000000..ba4acd407c4
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_commit_describe_multiple_tags.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_commit_describe_multiple_tags.tar.xz b/gix/tests/fixtures/generated-archives/make_commit_describe_multiple_tags.tar.xz
deleted file mode 100644
index f71e9bda776..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_commit_describe_multiple_tags.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_config_repo.tar b/gix/tests/fixtures/generated-archives/make_config_repo.tar
new file mode 100644
index 00000000000..91454114795
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_config_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_config_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_config_repo.tar.xz
deleted file mode 100644
index 4d0d9445652..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_config_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_config_repos.tar b/gix/tests/fixtures/generated-archives/make_config_repos.tar
new file mode 100644
index 00000000000..77529fdf5d1
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_config_repos.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_config_repos.tar.xz b/gix/tests/fixtures/generated-archives/make_config_repos.tar.xz
deleted file mode 100644
index 5922f04c591..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_config_repos.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_diff_repo.tar b/gix/tests/fixtures/generated-archives/make_diff_repo.tar
new file mode 100644
index 00000000000..a8270a8326d
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_diff_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_diff_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_diff_repo.tar.xz
deleted file mode 100644
index 7f86701b50a..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_diff_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_empty_repo.tar b/gix/tests/fixtures/generated-archives/make_empty_repo.tar
new file mode 100644
index 00000000000..14dfa55e2f0
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_empty_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_empty_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_empty_repo.tar.xz
deleted file mode 100644
index a189b77505b..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_empty_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_head_repos.tar b/gix/tests/fixtures/generated-archives/make_head_repos.tar
new file mode 100644
index 00000000000..aab41d05660
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_head_repos.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_head_repos.tar.xz b/gix/tests/fixtures/generated-archives/make_head_repos.tar.xz
deleted file mode 100644
index b9aa30f5dc8..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_head_repos.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_merge_repo.tar b/gix/tests/fixtures/generated-archives/make_merge_repo.tar
new file mode 100644
index 00000000000..a769d7b7e1f
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_merge_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_merge_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_merge_repo.tar.xz
deleted file mode 100644
index 2a807cd9d64..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_merge_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_packed_and_loose.tar b/gix/tests/fixtures/generated-archives/make_packed_and_loose.tar
new file mode 100644
index 00000000000..ecf1a18c2ca
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_packed_and_loose.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_packed_and_loose.tar.xz b/gix/tests/fixtures/generated-archives/make_packed_and_loose.tar.xz
deleted file mode 100644
index 06a86d86e78..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_packed_and_loose.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_pre_epoch_repo.tar b/gix/tests/fixtures/generated-archives/make_pre_epoch_repo.tar
new file mode 100644
index 00000000000..819f1e2aa3f
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_pre_epoch_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_pre_epoch_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_pre_epoch_repo.tar.xz
deleted file mode 100644
index 0090f6a1544..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_pre_epoch_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_rebase_i_repo.tar b/gix/tests/fixtures/generated-archives/make_rebase_i_repo.tar
new file mode 100644
index 00000000000..34d80aabb12
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_rebase_i_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_rebase_i_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_rebase_i_repo.tar.xz
deleted file mode 100644
index 17c9b3100cc..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_rebase_i_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_references_repo.tar b/gix/tests/fixtures/generated-archives/make_references_repo.tar
new file mode 100644
index 00000000000..9c2bc2ea2b9
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_references_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_references_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_references_repo.tar.xz
deleted file mode 100644
index b6b0a26f118..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_references_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_remote_config_repos.tar b/gix/tests/fixtures/generated-archives/make_remote_config_repos.tar
new file mode 100644
index 00000000000..604c41d8132
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_remote_config_repos.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_remote_config_repos.tar.xz b/gix/tests/fixtures/generated-archives/make_remote_config_repos.tar.xz
deleted file mode 100644
index 019cbbdcd02..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_remote_config_repos.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_repo_with_fork_and_dates.tar b/gix/tests/fixtures/generated-archives/make_repo_with_fork_and_dates.tar
new file mode 100644
index 00000000000..2848020904c
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_repo_with_fork_and_dates.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_repo_with_fork_and_dates.tar.xz b/gix/tests/fixtures/generated-archives/make_repo_with_fork_and_dates.tar.xz
deleted file mode 100644
index 68862b8c1cc..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_repo_with_fork_and_dates.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_rev_spec_parse_repos.tar b/gix/tests/fixtures/generated-archives/make_rev_spec_parse_repos.tar
new file mode 100644
index 00000000000..2f87a53cdcb
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_rev_spec_parse_repos.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_rev_spec_parse_repos.tar.xz b/gix/tests/fixtures/generated-archives/make_rev_spec_parse_repos.tar.xz
deleted file mode 100644
index dd1e1da550b..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_rev_spec_parse_repos.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_revert_repo.tar b/gix/tests/fixtures/generated-archives/make_revert_repo.tar
new file mode 100644
index 00000000000..023f1baf491
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_revert_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_revert_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_revert_repo.tar.xz
deleted file mode 100644
index 8a84d263f70..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_revert_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_revert_sequence_repo.tar b/gix/tests/fixtures/generated-archives/make_revert_sequence_repo.tar
new file mode 100644
index 00000000000..70c65b9351f
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_revert_sequence_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_revert_sequence_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_revert_sequence_repo.tar.xz
deleted file mode 100644
index 47049051a58..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_revert_sequence_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_shallow_repo.tar b/gix/tests/fixtures/generated-archives/make_shallow_repo.tar
new file mode 100644
index 00000000000..504473dd8e9
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_shallow_repo.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_shallow_repo.tar.xz b/gix/tests/fixtures/generated-archives/make_shallow_repo.tar.xz
deleted file mode 100644
index 6433d0d654a..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_shallow_repo.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_status_repos.tar b/gix/tests/fixtures/generated-archives/make_status_repos.tar
new file mode 100644
index 00000000000..bfa898c90c1
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_status_repos.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_status_repos.tar.xz b/gix/tests/fixtures/generated-archives/make_status_repos.tar.xz
deleted file mode 100644
index 3724b9a20c9..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_status_repos.tar.xz and /dev/null differ
diff --git a/gix/tests/fixtures/generated-archives/make_submodules.tar b/gix/tests/fixtures/generated-archives/make_submodules.tar
new file mode 100644
index 00000000000..2a38f8e7def
Binary files /dev/null and b/gix/tests/fixtures/generated-archives/make_submodules.tar differ
diff --git a/gix/tests/fixtures/generated-archives/make_submodules.tar.xz b/gix/tests/fixtures/generated-archives/make_submodules.tar.xz
deleted file mode 100644
index caead9bfe3d..00000000000
Binary files a/gix/tests/fixtures/generated-archives/make_submodules.tar.xz and /dev/null differ