diff --git a/tests/unit/__snapshots__/test_tree_reporter.ambr b/tests/unit/__snapshots__/test_tree_reporter.ambr
deleted file mode 100644
index af01c08ec8..0000000000
--- a/tests/unit/__snapshots__/test_tree_reporter.ambr
+++ /dev/null
@@ -1,3548 +0,0 @@
-# serializer version: 1
-# name: TestTUILooks.test_allocations_of_different_sizes
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_basic
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_basic_node_selected_leaf
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_basic_node_selected_not_leaf
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_biggest_allocations
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_hide_import_system
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_select_screen
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_show_uninteresting
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_show_uninteresting_and_hide_import_system
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_two_chains
- '''
-
-
- '''
-# ---
-# name: TestTUILooks.test_two_chains_after_expanding_second
- '''
-
-
- '''
-# ---
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_allocations_of_different_sizes.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_allocations_of_different_sizes.svg
new file mode 100644
index 0000000000..69c5212990
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_allocations_of_different_sizes.svg
@@ -0,0 +1,513 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_basic.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_basic.svg
new file mode 100644
index 0000000000..0453162857
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_basic.svg
@@ -0,0 +1,304 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_basic_node_selected_leaf.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_basic_node_selected_leaf.svg
new file mode 100644
index 0000000000..1cf050314c
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_basic_node_selected_leaf.svg
@@ -0,0 +1,307 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_basic_node_selected_not_leaf.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_basic_node_selected_not_leaf.svg
new file mode 100644
index 0000000000..ff2b0ab62f
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_basic_node_selected_not_leaf.svg
@@ -0,0 +1,307 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_biggest_allocations.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_biggest_allocations.svg
new file mode 100644
index 0000000000..72bc45cd72
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_biggest_allocations.svg
@@ -0,0 +1,226 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_hide_import_system.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_hide_import_system.svg
new file mode 100644
index 0000000000..fe4742ccff
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_hide_import_system.svg
@@ -0,0 +1,304 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_select_screen.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_select_screen.svg
new file mode 100644
index 0000000000..731ae11611
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_select_screen.svg
@@ -0,0 +1,307 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_show_uninteresting.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_show_uninteresting.svg
new file mode 100644
index 0000000000..635c67b097
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_show_uninteresting.svg
@@ -0,0 +1,305 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_show_uninteresting_and_hide_import_system.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_show_uninteresting_and_hide_import_system.svg
new file mode 100644
index 0000000000..4ecd010024
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_show_uninteresting_and_hide_import_system.svg
@@ -0,0 +1,305 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_two_chains.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_two_chains.svg
new file mode 100644
index 0000000000..0f9baaf19c
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_two_chains.svg
@@ -0,0 +1,305 @@
+
diff --git a/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_two_chains_after_expanding_second.svg b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_two_chains_after_expanding_second.svg
new file mode 100644
index 0000000000..a718ca1e79
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tree_reporter/TestTUILooks.test_two_chains_after_expanding_second.svg
@@ -0,0 +1,309 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter.ambr b/tests/unit/__snapshots__/test_tui_reporter.ambr
deleted file mode 100644
index c430ea0782..0000000000
--- a/tests/unit/__snapshots__/test_tui_reporter.ambr
+++ /dev/null
@@ -1,1769 +0,0 @@
-# serializer version: 1
-# name: test_merge_threads
- '''
-
-
- '''
-# ---
-# name: test_tui_basic[narrow-terminal-focus-header-long-snapshots]
- '''
-
-
- '''
-# ---
-# name: test_tui_basic[narrow-terminal-short-snapshots]
- '''
-
-
- '''
-# ---
-# name: test_tui_basic[very-wide-terminal-short-snapshots]
- '''
-
-
- '''
-# ---
-# name: test_tui_basic[wide-terminal-long-snapshots]
- '''
-
-
- '''
-# ---
-# name: test_tui_gradient
- '''
-
-
- '''
-# ---
-# name: test_tui_pause[narrow-terminal-connected]
- '''
-
-
- '''
-# ---
-# name: test_tui_pause[narrow-terminal-disconnected]
- '''
-
-
- '''
-# ---
-# name: test_tui_pause[wider-terminal]
- '''
-
-
- '''
-# ---
-# name: test_unmerge_threads
- '''
-
-
- '''
-# ---
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_merge_threads.svg b/tests/unit/__snapshots__/test_tui_reporter/test_merge_threads.svg
new file mode 100644
index 0000000000..aecf7e9081
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_merge_threads.svg
@@ -0,0 +1,160 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[narrow-terminal-focus-header-long-snapshots].svg b/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[narrow-terminal-focus-header-long-snapshots].svg
new file mode 100644
index 0000000000..f99385a78d
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[narrow-terminal-focus-header-long-snapshots].svg
@@ -0,0 +1,163 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[narrow-terminal-short-snapshots].svg b/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[narrow-terminal-short-snapshots].svg
new file mode 100644
index 0000000000..a1010ca3b8
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[narrow-terminal-short-snapshots].svg
@@ -0,0 +1,160 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[very-wide-terminal-short-snapshots].svg b/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[very-wide-terminal-short-snapshots].svg
new file mode 100644
index 0000000000..1225d12c76
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[very-wide-terminal-short-snapshots].svg
@@ -0,0 +1,167 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[wide-terminal-long-snapshots].svg b/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[wide-terminal-long-snapshots].svg
new file mode 100644
index 0000000000..917bcfe781
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_tui_basic[wide-terminal-long-snapshots].svg
@@ -0,0 +1,169 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_tui_gradient.svg b/tests/unit/__snapshots__/test_tui_reporter/test_tui_gradient.svg
new file mode 100644
index 0000000000..5057f4a3aa
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_tui_gradient.svg
@@ -0,0 +1,260 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_tui_pause[narrow-terminal-connected].svg b/tests/unit/__snapshots__/test_tui_reporter/test_tui_pause[narrow-terminal-connected].svg
new file mode 100644
index 0000000000..097bda6349
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_tui_pause[narrow-terminal-connected].svg
@@ -0,0 +1,157 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_tui_pause[narrow-terminal-disconnected].svg b/tests/unit/__snapshots__/test_tui_reporter/test_tui_pause[narrow-terminal-disconnected].svg
new file mode 100644
index 0000000000..7b15370831
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_tui_pause[narrow-terminal-disconnected].svg
@@ -0,0 +1,159 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_tui_pause[wider-terminal].svg b/tests/unit/__snapshots__/test_tui_reporter/test_tui_pause[wider-terminal].svg
new file mode 100644
index 0000000000..b396af4216
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_tui_pause[wider-terminal].svg
@@ -0,0 +1,163 @@
+
diff --git a/tests/unit/__snapshots__/test_tui_reporter/test_unmerge_threads.svg b/tests/unit/__snapshots__/test_tui_reporter/test_unmerge_threads.svg
new file mode 100644
index 0000000000..cfd9edb862
--- /dev/null
+++ b/tests/unit/__snapshots__/test_tui_reporter/test_unmerge_threads.svg
@@ -0,0 +1,160 @@
+