diff --git a/crates/aiken-project/src/tests/gen_uplc.rs b/crates/aiken-project/src/tests/gen_uplc.rs
index 4fa1ba54..ac25ffaa 100644
--- a/crates/aiken-project/src/tests/gen_uplc.rs
+++ b/crates/aiken-project/src/tests/gen_uplc.rs
@@ -3896,31 +3896,37 @@ fn foldl_type_mismatch() {
             .lambda("cry")
             .apply(
                 Term::var("foldl")
-                    .lambda("foldl")
-                    .apply(Term::var("foldl").apply(Term::var("foldl")))
                     .lambda("foldl")
                     .apply(
-                        Term::var("self")
-                            .delayed_choose_list(
-                                Term::var("zero"),
-                                Term::var("foldl")
-                                    .apply(Term::var("foldl"))
-                                    .apply(Term::var("xs"))
-                                    .apply(Term::var("with"))
-                                    .apply(
-                                        Term::var("with")
-                                            .apply(Term::var("x"))
-                                            .apply(Term::var("zero")),
+                        Term::var("foldl")
+                            .apply(Term::var("foldl"))
+                            .apply(Term::var("self"))
+                            .apply(Term::var("zero"))
+                            .lambda("foldl")
+                            .apply(
+                                Term::var("self")
+                                    .delayed_choose_list(
+                                        Term::var("zero"),
+                                        Term::var("foldl")
+                                            .apply(Term::var("foldl"))
+                                            .apply(Term::var("xs"))
+                                            .apply(
+                                                Term::var("with")
+                                                    .apply(Term::var("x"))
+                                                    .apply(Term::var("zero")),
+                                            )
+                                            .lambda("xs")
+                                            .apply(Term::tail_list().apply(Term::var("self")))
+                                            .lambda("x")
+                                            .apply(Term::head_list().apply(Term::var("self"))),
                                     )
-                                    .lambda("xs")
-                                    .apply(Term::tail_list().apply(Term::var("self")))
-                                    .lambda("x")
-                                    .apply(Term::head_list().apply(Term::var("self"))),
+                                    .lambda("zero")
+                                    .lambda("self")
+                                    .lambda("foldl"),
                             )
                             .lambda("zero")
                             .lambda("with")
-                            .lambda("self")
-                            .lambda("foldl"),
+                            .lambda("self"),
                     )
                     .apply(Term::var("outputs"))
                     .apply(
@@ -4229,25 +4235,31 @@ fn expect_head_cast_data_with_tail() {
             .lambda("_")
             .apply(
                 Term::var("expect_on_list")
-                    .lambda("expect_on_list")
-                    .apply(Term::var("expect_on_list").apply(Term::var("expect_on_list")))
                     .lambda("expect_on_list")
                     .apply(
-                        Term::var("list_to_check")
-                            .delayed_choose_list(
-                                Term::unit(),
-                                Term::var("expect_on_list")
-                                    .apply(Term::var("expect_on_list"))
-                                    .apply(Term::tail_list().apply(Term::var("list_to_check")))
-                                    .apply(Term::var("check_with"))
-                                    .lambda("_")
-                                    .apply(Term::var("check_with").apply(
-                                        Term::head_list().apply(Term::var("list_to_check")),
-                                    )),
+                        Term::var("expect_on_list")
+                            .apply(Term::var("expect_on_list"))
+                            .apply(Term::var("list_to_check"))
+                            .lambda("expect_on_list")
+                            .apply(
+                                Term::var("list_to_check")
+                                    .delayed_choose_list(
+                                        Term::unit(),
+                                        Term::var("expect_on_list")
+                                            .apply(Term::var("expect_on_list"))
+                                            .apply(
+                                                Term::tail_list().apply(Term::var("list_to_check")),
+                                            )
+                                            .lambda("_")
+                                            .apply(Term::var("check_with").apply(
+                                                Term::head_list().apply(Term::var("list_to_check")),
+                                            )),
+                                    )
+                                    .lambda("list_to_check")
+                                    .lambda("expect_on_list"),
                             )
                             .lambda("check_with")
-                            .lambda("list_to_check")
-                            .lambda("expect_on_list"),
+                            .lambda("list_to_check"),
                     )
                     .apply(Term::var("tail_2"))
                     .apply(