diff --git a/tests/snapshots/files__gamma_condition_and-optimize.snap b/tests/snapshots/files__gamma_condition_and-optimize.snap
index d69e51332..e49f6138d 100644
--- a/tests/snapshots/files__gamma_condition_and-optimize.snap
+++ b/tests/snapshots/files__gamma_condition_and-optimize.snap
@@ -1,25 +1,11 @@
 ---
 source: tests/files.rs
 expression: visualization.result
+snapshot_kind: text
 ---
 # ARGS: 1
 @main(v0: int) {
   c1_: int = const 3;
-  c2_: int = const 0;
-  v3_: bool = lt c2_ v0;
-  v4_: bool = lt v0 c2_;
-  c5_: int = const 1;
-  c6_: int = const 3;
-  v7_: int = id c6_;
-  br v3_ .b8_ .b9_;
-.b8_:
-  c10_: int = const 3;
-  v7_: int = id c10_;
   print c1_;
   ret;
-  jmp .b11_;
-.b9_:
-  print c1_;
-  ret;
-.b11_:
 }
diff --git a/tests/snapshots/files__gamma_condition_and-optimize.snap.new b/tests/snapshots/files__gamma_condition_and-optimize.snap.new
deleted file mode 100644
index 6d6b5a09a..000000000
--- a/tests/snapshots/files__gamma_condition_and-optimize.snap.new
+++ /dev/null
@@ -1,11 +0,0 @@
----
-source: tests/files.rs
-assertion_line: 36
-expression: visualization.result
----
-# ARGS: 1
-@main(v0: int) {
-  c1_: int = const 3;
-  print c1_;
-  ret;
-}
diff --git a/tests/snapshots/files__if_invariant_do_pull_out-optimize.snap b/tests/snapshots/files__if_invariant_do_pull_out-optimize.snap
index bdf6e8299..d4d502135 100644
--- a/tests/snapshots/files__if_invariant_do_pull_out-optimize.snap
+++ b/tests/snapshots/files__if_invariant_do_pull_out-optimize.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/files.rs
 expression: visualization.result
+snapshot_kind: text
 ---
 # ARGS: 20
 @unrelated_fn(v0: int): int {
@@ -23,10 +24,10 @@ expression: visualization.result
   v5_: int = mul c4_ v3_;
   br v2_ .b6_ .b7_;
 .b6_:
-  c8_: int = const 4;
-  v9_: int = div v3_ c8_;
-  v10_: int = add v3_ v5_;
-  v11_: int = add v10_ v9_;
+  v8_: int = add v0 v5_;
+  c9_: int = const 4;
+  v10_: int = div v0 c9_;
+  v11_: int = add v10_ v8_;
   v12_: int = id v11_;
   print v12_;
   ret;
@@ -36,8 +37,8 @@ expression: visualization.result
   v15_: int = mul c14_ v0;
   c16_: int = const 5;
   v17_: int = div v15_ c16_;
-  v18_: int = sub v5_ v0;
-  v19_: int = add v17_ v18_;
+  v18_: int = sub v17_ v0;
+  v19_: int = add v18_ v5_;
   v12_: int = id v19_;
   print v12_;
   ret;
diff --git a/tests/snapshots/files__if_invariant_do_pull_out-optimize.snap.new b/tests/snapshots/files__if_invariant_do_pull_out-optimize.snap.new
deleted file mode 100644
index d66bead0a..000000000
--- a/tests/snapshots/files__if_invariant_do_pull_out-optimize.snap.new
+++ /dev/null
@@ -1,46 +0,0 @@
----
-source: tests/files.rs
-assertion_line: 36
-expression: visualization.result
----
-# ARGS: 20
-@unrelated_fn(v0: int): int {
-  c1_: int = const 4;
-  v2_: int = div v0 c1_;
-  ret v2_;
-}
-@other_unrelated_fn(v0: int): int {
-  c1_: int = const 3;
-  v2_: int = mul c1_ v0;
-  c3_: int = const 5;
-  v4_: int = div v2_ c3_;
-  ret v4_;
-}
-@main(v0: int) {
-  c1_: int = const 0;
-  v2_: bool = gt v0 c1_;
-  v3_: int = abs v0;
-  c4_: int = const 2;
-  v5_: int = mul c4_ v3_;
-  br v2_ .b6_ .b7_;
-.b6_:
-  v8_: int = add v0 v5_;
-  c9_: int = const 4;
-  v10_: int = div v0 c9_;
-  v11_: int = add v10_ v8_;
-  v12_: int = id v11_;
-  print v12_;
-  ret;
-  jmp .b13_;
-.b7_:
-  c14_: int = const 3;
-  v15_: int = mul c14_ v0;
-  c16_: int = const 5;
-  v17_: int = div v15_ c16_;
-  v18_: int = sub v17_ v0;
-  v19_: int = add v18_ v5_;
-  v12_: int = id v19_;
-  print v12_;
-  ret;
-.b13_:
-}
diff --git a/tests/snapshots/files__if_invariant_dont_pull_out-optimize.snap b/tests/snapshots/files__if_invariant_dont_pull_out-optimize.snap
index 993f38f9d..ace7f8238 100644
--- a/tests/snapshots/files__if_invariant_dont_pull_out-optimize.snap
+++ b/tests/snapshots/files__if_invariant_dont_pull_out-optimize.snap
@@ -1,6 +1,7 @@
 ---
 source: tests/files.rs
 expression: visualization.result
+snapshot_kind: text
 ---
 # ARGS: 20
 @unrelated_fn(v0: int, v1: int): int {
@@ -25,7 +26,7 @@ expression: visualization.result
 .b6_:
   c8_: int = const 3;
   v9_: int = div v5_ c8_;
-  v10_: int = div v0 v9_;
+  v10_: int = div v3_ v9_;
   v11_: int = id v10_;
   print v11_;
   ret;
diff --git a/tests/snapshots/files__if_invariant_dont_pull_out-optimize.snap.new b/tests/snapshots/files__if_invariant_dont_pull_out-optimize.snap.new
deleted file mode 100644
index d84c6d160..000000000
--- a/tests/snapshots/files__if_invariant_dont_pull_out-optimize.snap.new
+++ /dev/null
@@ -1,42 +0,0 @@
----
-source: tests/files.rs
-assertion_line: 36
-expression: visualization.result
----
-# ARGS: 20
-@unrelated_fn(v0: int, v1: int): int {
-  c2_: int = const 3;
-  v3_: int = div v1 c2_;
-  v4_: int = div v0 v3_;
-  ret v4_;
-}
-@other_unrelated_fn(v0: int, v1: int): int {
-  c2_: int = const 5;
-  v3_: int = div v0 c2_;
-  v4_: int = div v1 v3_;
-  ret v4_;
-}
-@main(v0: int) {
-  c1_: int = const 0;
-  v2_: bool = gt v0 c1_;
-  v3_: int = abs v0;
-  c4_: int = const 2;
-  v5_: int = mul c4_ v3_;
-  br v2_ .b6_ .b7_;
-.b6_:
-  c8_: int = const 3;
-  v9_: int = div v5_ c8_;
-  v10_: int = div v3_ v9_;
-  v11_: int = id v10_;
-  print v11_;
-  ret;
-  jmp .b12_;
-.b7_:
-  c13_: int = const 5;
-  v14_: int = div v0 c13_;
-  v15_: int = div v5_ v14_;
-  v11_: int = id v15_;
-  print v11_;
-  ret;
-.b12_:
-}