diff --git a/frontend-wasm/tests/expected/add.hir b/frontend-wasm/tests/expected/add.hir
index b7b2abfd8..f3bc2c2bb 100644
--- a/frontend-wasm/tests/expected/add.hir
+++ b/frontend-wasm/tests/expected/add.hir
@@ -1,24 +1,34 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_239a60d2cc893c838f4427eafefdb541ab7c907f4b97a510f3e3eef268518bea
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #__main) (result i32)
-        (block 0
-            (let (v1 i32) (const.i32 1))
-            (let (v2 i32) (const.i32 2))
-            (let (v3 i32) (call #add v1 v2))
-            (ret v3))
-    )
+        ;; Functions
+        (func (export #add) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (add.wrapping v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
 
-    (func (export #add) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (add.wrapping v1 v0))
-            (ret v3))
+        (func (export #__main) (result i32)
+            (block 0
+                (let (v1 i32) (const.i32 1))
+                (let (v2 i32) (const.i32 2))
+                (let (v3 i32) (call #add v1 v2))
+                (br (block 1 v3)))
+
+            (block 1 (param v0 i32)
+                (ret v0))
+        )
     )
+
 )
diff --git a/frontend-wasm/tests/expected/add.wat b/frontend-wasm/tests/expected/add.wat
index 32fdc2d19..661fc5b60 100644
--- a/frontend-wasm/tests/expected/add.wat
+++ b/frontend-wasm/tests/expected/add.wat
@@ -1,4 +1,4 @@
-(module $239a60d2cc893c838f4427eafefdb541ab7c907f4b97a510f3e3eef268518bea.wasm
+(module $test_rust_239a60d2cc893c838f4427eafefdb541ab7c907f4b97a510f3e3eef268518bea.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (type (;1;) (func (result i32)))
   (func $add (;0;) (type 0) (param i32 i32) (result i32)
diff --git a/frontend-wasm/tests/expected/array.hir b/frontend-wasm/tests/expected/array.hir
index 18f696e6d..2c2701421 100644
--- a/frontend-wasm/tests/expected/array.hir
+++ b/frontend-wasm/tests/expected/array.hir
@@ -1,58 +1,71 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
-    (const (id 1) 0x00100028)
-    (const (id 2) 0x00100030)
-
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 1))
-    (global (export #gv2) (id 2) (type i32) (const 2))
-
-    ;; Functions
-    (func (export #__main) (result i32)
-        (block 0
-            (let (v1 i32) (const.i32 1048576))
-            (let (v2 i32) (const.i32 5))
-            (let (v3 i32) (call #sum_arr v1 v2))
-            (let (v4 i32) (const.i32 1048596))
-            (let (v5 i32) (const.i32 5))
-            (let (v6 i32) (call #sum_arr v4 v5))
-            (let (v7 i32) (add.wrapping v3 v6))
-            (ret v7))
-    )
+(component 
+    ;; Modules
+    (module #test_rust_d63291a98b435c53f58385d5782fb46f0b0b78bee8e860843e7223106d66f7d6
+        ;; Data Segments
+        (data (mut) (offset 1048576) 0x0100000002000000030000000400000005000000060000000700000008000000090000000a000000)
+
+        ;; Constants
+        (const (id 0) 0x00100000)
+        (const (id 1) 0x00100028)
+        (const (id 2) 0x00100030)
+
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 1))
+        (global (export #gv2) (id 2) (type i32) (const 2))
+
+        ;; Functions
+        (func (export #sum_arr) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (const.i32 0))
+                (let (v4 i32) (const.i32 0))
+                (let (v5 i1) (eq v1 0))
+                (let (v6 i32) (cast v5))
+                (let (v7 i1) (neq v6 0))
+                (condbr v7 (block 2 v4) (block 3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+
+            (block 2 (param v20 i32)
+                (br (block 1 v20)))
 
-    (func (export #sum_arr) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (const.i32 0))
-            (let (v4 i32) (const.i32 0))
-            (let (v5 i1) (eq v1 0))
-            (let (v6 i32) (cast v5))
-            (let (v7 i1) (neq v6 0))
-            (condbr v7 (block 7) (block 3)))
-
-        (block 7
-            (ret v4))
-
-        (block 3
-            (br (block 4 v0 v4 v1)))
-
-        (block 4 (param v8 i32) (param v12 i32) (param v16 i32)
-            (let (v9 u32) (cast v8))
-            (let (v10 (ptr i32)) (inttoptr v9))
-            (let (v11 i32) (load v10))
-            (let (v13 i32) (add.wrapping v11 v12))
-            (let (v14 i32) (const.i32 4))
-            (let (v15 i32) (add.wrapping v8 v14))
-            (let (v17 i32) (const.i32 -1))
-            (let (v18 i32) (add.wrapping v16 v17))
-            (let (v19 i1) (neq v18 0))
-            (condbr v19 (block 8) (block 6)))
-
-        (block 8
-            (br (block 4 v15 v13 v18)))
-
-        (block 6
-            (ret v13))
+            (block 3
+                (br (block 4 v0 v4 v1)))
+
+            (block 4 (param v8 i32) (param v12 i32) (param v16 i32)
+                (let (v9 u32) (cast v8))
+                (let (v10 (ptr i32)) (inttoptr v9))
+                (let (v11 i32) (load v10))
+                (let (v13 i32) (add.wrapping v11 v12))
+                (let (v14 i32) (const.i32 4))
+                (let (v15 i32) (add.wrapping v8 v14))
+                (let (v17 i32) (const.i32 -1))
+                (let (v18 i32) (add.wrapping v16 v17))
+                (let (v19 i1) (neq v18 0))
+                (condbr v19 (block 4 v15 v13 v18) (block 6)))
+
+            (block 5
+                (br (block 2 v13)))
+
+            (block 6
+                (br (block 5)))
+        )
+
+        (func (export #__main) (result i32)
+            (block 0
+                (let (v1 i32) (const.i32 1048576))
+                (let (v2 i32) (const.i32 5))
+                (let (v3 i32) (call #sum_arr v1 v2))
+                (let (v4 i32) (const.i32 1048596))
+                (let (v5 i32) (const.i32 5))
+                (let (v6 i32) (call #sum_arr v4 v5))
+                (let (v7 i32) (add.wrapping v3 v6))
+                (br (block 1 v7)))
+
+            (block 1 (param v0 i32)
+                (ret v0))
+        )
     )
+
 )
diff --git a/frontend-wasm/tests/expected/array.wat b/frontend-wasm/tests/expected/array.wat
index 0a3cc2b57..199fc5cef 100644
--- a/frontend-wasm/tests/expected/array.wat
+++ b/frontend-wasm/tests/expected/array.wat
@@ -1,4 +1,4 @@
-(module $d63291a98b435c53f58385d5782fb46f0b0b78bee8e860843e7223106d66f7d6.wasm
+(module $test_rust_d63291a98b435c53f58385d5782fb46f0b0b78bee8e860843e7223106d66f7d6.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (type (;1;) (func (result i32)))
   (func $sum_arr (;0;) (type 0) (param i32 i32) (result i32)
diff --git a/frontend-wasm/tests/expected/enum.hir b/frontend-wasm/tests/expected/enum.hir
index 0d6d16b80..a263b466e 100644
--- a/frontend-wasm/tests/expected/enum.hir
+++ b/frontend-wasm/tests/expected/enum.hir
@@ -1,53 +1,64 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
-
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
-
-    ;; Functions
-    (func (export #__main) (result i32)
-        (block 0
-            (let (v1 i32) (const.i32 3))
-            (let (v2 i32) (const.i32 5))
-            (let (v3 i32) (const.i32 0))
-            (let (v4 i32) (call #match_enum v1 v2 v3))
-            (let (v5 i32) (const.i32 3))
-            (let (v6 i32) (const.i32 5))
-            (let (v7 i32) (const.i32 1))
-            (let (v8 i32) (call #match_enum v5 v6 v7))
-            (let (v9 i32) (add.wrapping v4 v8))
-            (let (v10 i32) (const.i32 3))
-            (let (v11 i32) (const.i32 5))
-            (let (v12 i32) (const.i32 2))
-            (let (v13 i32) (call #match_enum v10 v11 v12))
-            (let (v14 i32) (add.wrapping v9 v13))
-            (ret v14))
-    )
+(component 
+    ;; Modules
+    (module #test_rust_f0bb65319ffababec660ada9dd2dd5f137503f60cf9c37332d6f7e171f275824
+        ;; Constants
+        (const (id 0) 0x00100000)
+
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
+
+        ;; Functions
+        (func (export #match_enum)
+              (param i32) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32) (param v2 i32)
+                (let (v4 i32) (const.i32 255))
+                (let (v5 i32) (band v2 v4))
+                (let (v6 u32) (cast v5))
+                (switchv6
+                    (0 . (block 4))
+                    (1 . (block 3))
+                    (2 . (block 2))
+                    (_ . (block4))))
+
+            (block 1 (param v3 i32)
+                (ret v3))
+
+            (block 2
+                (let (v9 i32) (mul.wrapping v1 v0))
+                (br (block 1 v9)))
 
-    (func (export #match_enum) (param i32) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32) (param v2 i32)
-            (let (v4 i32) (const.i32 255))
-            (let (v5 i32) (band v2 v4))
-            (let (v6 u32) (cast v5))
-            (switchv6
-                (0 . (block 4))
-                (1 . (block 3))
-                (2 . (block 2))
-                (_ . (block4))))
-
-        (block 2
-            (let (v9 i32) (mul.wrapping v1 v0))
-            (ret v9))
-
-        (block 3
-            (let (v8 i32) (sub.wrapping v0 v1))
-            (ret v8))
-
-        (block 4
-            (let (v7 i32) (add.wrapping v1 v0))
-            (ret v7))
+            (block 3
+                (let (v8 i32) (sub.wrapping v0 v1))
+                (ret v8))
+
+            (block 4
+                (let (v7 i32) (add.wrapping v1 v0))
+                (ret v7))
+        )
+
+        (func (export #__main) (result i32)
+            (block 0
+                (let (v1 i32) (const.i32 3))
+                (let (v2 i32) (const.i32 5))
+                (let (v3 i32) (const.i32 0))
+                (let (v4 i32) (call #match_enum v1 v2 v3))
+                (let (v5 i32) (const.i32 3))
+                (let (v6 i32) (const.i32 5))
+                (let (v7 i32) (const.i32 1))
+                (let (v8 i32) (call #match_enum v5 v6 v7))
+                (let (v9 i32) (add.wrapping v4 v8))
+                (let (v10 i32) (const.i32 3))
+                (let (v11 i32) (const.i32 5))
+                (let (v12 i32) (const.i32 2))
+                (let (v13 i32) (call #match_enum v10 v11 v12))
+                (let (v14 i32) (add.wrapping v9 v13))
+                (br (block 1 v14)))
+
+            (block 1 (param v0 i32)
+                (ret v0))
+        )
     )
+
 )
diff --git a/frontend-wasm/tests/expected/enum.wat b/frontend-wasm/tests/expected/enum.wat
index d00c358bb..4584725e1 100644
--- a/frontend-wasm/tests/expected/enum.wat
+++ b/frontend-wasm/tests/expected/enum.wat
@@ -1,4 +1,4 @@
-(module $f0bb65319ffababec660ada9dd2dd5f137503f60cf9c37332d6f7e171f275824.wasm
+(module $test_rust_f0bb65319ffababec660ada9dd2dd5f137503f60cf9c37332d6f7e171f275824.wasm
   (type (;0;) (func (param i32 i32 i32) (result i32)))
   (type (;1;) (func (result i32)))
   (func $match_enum (;0;) (type 0) (param i32 i32 i32) (result i32)
diff --git a/frontend-wasm/tests/expected/fib.hir b/frontend-wasm/tests/expected/fib.hir
index c9ad726dd..ef35a2143 100644
--- a/frontend-wasm/tests/expected/fib.hir
+++ b/frontend-wasm/tests/expected/fib.hir
@@ -1,42 +1,49 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
-
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
-
-    ;; Functions
-    (func (export #__main) (result i32)
-        (block 0
-            (let (v1 i32) (const.i32 25))
-            (let (v2 i32) (call #fib v1))
-            (ret v2))
+(component 
+    ;; Modules
+    (module #test_rust_73529556a38891bec6db2a041967158b0ffe0bca961857830b2fd7fd429d6a23
+        ;; Constants
+        (const (id 0) 0x00100000)
+
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
+
+        ;; Functions
+        (func (export #fib) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 0))
+                (let (v3 i32) (const.i32 0))
+                (let (v4 i32) (const.i32 1))
+                (br (block 2 v4 v0 v3)))
+
+            (block 1 (param v1 i32))
+
+            (block 2 (param v6 i32) (param v7 i32) (param v9 i32)
+                (let (v8 i1) (neq v7 0))
+                (condbr v8 (block 4) (block 5)))
+
+            (block 3 (param v5 i32))
+
+            (block 4
+                (let (v10 i32) (const.i32 -1))
+                (let (v11 i32) (add.wrapping v7 v10))
+                (let (v12 i32) (add.wrapping v9 v6))
+                (br (block 2 v12 v11 v6)))
+
+            (block 5
+                (ret v9))
+        )
+
+        (func (export #__main) (result i32)
+            (block 0
+                (let (v1 i32) (const.i32 25))
+                (let (v2 i32) (call #fib v1))
+                (br (block 1 v2)))
+
+            (block 1 (param v0 i32)
+                (ret v0))
+        )
     )
 
-    (func (export #fib) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 0))
-            (let (v3 i32) (const.i32 0))
-            (let (v4 i32) (const.i32 1))
-            (br (block 2 v4 v0 v3)))
-
-        (block 1 (param v1 i32))
-
-        (block 2 (param v6 i32) (param v7 i32) (param v9 i32)
-            (let (v8 i1) (neq v7 0))
-            (condbr v8 (block 4) (block 5)))
-
-        (block 3 (param v5 i32))
-
-        (block 4
-            (let (v10 i32) (const.i32 -1))
-            (let (v11 i32) (add.wrapping v7 v10))
-            (let (v12 i32) (add.wrapping v9 v6))
-            (br (block 2 v12 v11 v6)))
-
-        (block 5
-            (ret v9))
-    )
 )
diff --git a/frontend-wasm/tests/expected/fib.wat b/frontend-wasm/tests/expected/fib.wat
index 97db5e9d2..3d150c148 100644
--- a/frontend-wasm/tests/expected/fib.wat
+++ b/frontend-wasm/tests/expected/fib.wat
@@ -1,4 +1,4 @@
-(module $73529556a38891bec6db2a041967158b0ffe0bca961857830b2fd7fd429d6a23.wasm
+(module $test_rust_73529556a38891bec6db2a041967158b0ffe0bca961857830b2fd7fd429d6a23.wasm
   (type (;0;) (func (param i32) (result i32)))
   (type (;1;) (func (result i32)))
   (func $fib (;0;) (type 0) (param i32) (result i32)
diff --git a/frontend-wasm/tests/expected/static_mut.hir b/frontend-wasm/tests/expected/static_mut.hir
index a896f5bbe..df53775f8 100644
--- a/frontend-wasm/tests/expected/static_mut.hir
+++ b/frontend-wasm/tests/expected/static_mut.hir
@@ -1,61 +1,74 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
-    (const (id 1) 0x00100009)
-    (const (id 2) 0x00100010)
-
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 1))
-    (global (export #gv2) (id 2) (type i32) (const 2))
-
-    ;; Functions
-    (func (export #__main) (result i32)
-        (block 0
-            (let (v1 i32) (const.i32 0))
-            (call #global_var_update)
-            (let (v2 i32) (const.i32 0))
-            (let (v3 i32) (const.i32 -9))
-            (br (block 2 v3 v2)))
-
-        (block 2 (param v4 i32) (param v11 i32)
-            (let (v5 i32) (const.i32 1048585))
-            (let (v6 i32) (add.wrapping v4 v5))
-            (let (v7 u32) (cast v6))
-            (let (v8 (ptr u8)) (inttoptr v7))
-            (let (v9 u8) (load v8))
-            (let (v10 i32) (zext v9))
-            (let (v12 i32) (add.wrapping v10 v11))
-            (let (v13 i32) (const.i32 1))
-            (let (v14 i32) (add.wrapping v4 v13))
-            (let (v15 i1) (neq v14 0))
-            (condbr v15 (block 5) (block 4)))
-
-        (block 5
-            (br (block 2 v14 v12)))
-
-        (block 4
-            (let (v16 i32) (const.i32 255))
-            (let (v17 i32) (band v12 v16))
-            (ret v17))
-    )
+(component 
+    ;; Modules
+    (module #test_rust_e6d553fb1c80aef6e5d6f2891701197bedac471cf510bd2495f99889d9543cd4
+        ;; Data Segments
+        (data (offset 1048576) 0x010203040506070809)
+
+        ;; Constants
+        (const (id 0) 0x00100000)
+        (const (id 1) 0x00100009)
+        (const (id 2) 0x00100010)
+
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 1))
+        (global (export #gv2) (id 2) (type i32) (const 2))
+
+        ;; Functions
+        (func (export #global_var_update) 
+            (block 0
+                (let (v0 i32) (const.i32 0))
+                (let (v1 i32) (const.i32 0))
+                (let (v2 u32) (cast v1))
+                (let (v3 u32) (add.checked v2 1048577))
+                (let (v4 (ptr u8)) (inttoptr v3))
+                (let (v5 u8) (load v4))
+                (let (v6 i32) (zext v5))
+                (let (v7 i32) (const.i32 1))
+                (let (v8 i32) (add.wrapping v6 v7))
+                (let (v9 u8) (trunc v8))
+                (let (v10 u32) (cast v0))
+                (let (v11 u32) (add.checked v10 1048576))
+                (let (v12 (ptr u8)) (inttoptr v11))
+                (store v12 v9)
+                (br (block 1)))
+
+            (block 1
+                (ret))
+        )
 
-    (func (export #global_var_update) 
-        (block 0
-            (let (v0 i32) (const.i32 0))
-            (let (v1 i32) (const.i32 0))
-            (let (v2 u32) (cast v1))
-            (let (v3 u32) (add.checked v2 1048577))
-            (let (v4 (ptr u8)) (inttoptr v3))
-            (let (v5 u8) (load v4))
-            (let (v6 i32) (zext v5))
-            (let (v7 i32) (const.i32 1))
-            (let (v8 i32) (add.wrapping v6 v7))
-            (let (v9 u8) (trunc v8))
-            (let (v10 u32) (cast v0))
-            (let (v11 u32) (add.checked v10 1048576))
-            (let (v12 (ptr u8)) (inttoptr v11))
-            (store v12 v9)
-            (ret))
+        (func (export #__main) (result i32)
+            (block 0
+                (let (v1 i32) (const.i32 0))
+                (call #global_var_update)
+                (let (v2 i32) (const.i32 0))
+                (let (v3 i32) (const.i32 -9))
+                (br (block 2 v3 v2)))
+
+            (block 1 (param v0 i32)
+                (ret v0))
+
+            (block 2 (param v4 i32) (param v11 i32)
+                (let (v5 i32) (const.i32 1048585))
+                (let (v6 i32) (add.wrapping v4 v5))
+                (let (v7 u32) (cast v6))
+                (let (v8 (ptr u8)) (inttoptr v7))
+                (let (v9 u8) (load v8))
+                (let (v10 i32) (zext v9))
+                (let (v12 i32) (add.wrapping v10 v11))
+                (let (v13 i32) (const.i32 1))
+                (let (v14 i32) (add.wrapping v4 v13))
+                (let (v15 i1) (neq v14 0))
+                (condbr v15 (block 2 v14 v12) (block 4)))
+
+            (block 3
+                (let (v16 i32) (const.i32 255))
+                (let (v17 i32) (band v12 v16))
+                (br (block 1 v17)))
+
+            (block 4
+                (br (block 3)))
+        )
     )
+
 )
diff --git a/frontend-wasm/tests/expected/static_mut.wat b/frontend-wasm/tests/expected/static_mut.wat
index 95391a62f..a57bb6154 100644
--- a/frontend-wasm/tests/expected/static_mut.wat
+++ b/frontend-wasm/tests/expected/static_mut.wat
@@ -1,4 +1,4 @@
-(module $e6d553fb1c80aef6e5d6f2891701197bedac471cf510bd2495f99889d9543cd4.wasm
+(module $test_rust_e6d553fb1c80aef6e5d6f2891701197bedac471cf510bd2495f99889d9543cd4.wasm
   (type (;0;) (func))
   (type (;1;) (func (result i32)))
   (func $global_var_update (;0;) (type 0)
diff --git a/frontend-wasm/tests/test_rust_comp.rs b/frontend-wasm/tests/test_rust_comp.rs
index 7c8d872dd..21950700c 100644
--- a/frontend-wasm/tests/test_rust_comp.rs
+++ b/frontend-wasm/tests/test_rust_comp.rs
@@ -28,7 +28,13 @@ fn rust_array() {
     test.expect_wasm(expect_file!["./expected/array.wat"]);
     test.expect_ir(expect_file!["./expected/array.hir"]);
     assert!(
-        test.hir.unwrap().unwrap_program().segments().last().unwrap().is_readonly(),
+        test.hir()
+            .unwrap_component()
+            .first_module()
+            .segments()
+            .last()
+            .unwrap()
+            .is_readonly(),
         "data segment should be readonly"
     );
 }
@@ -39,7 +45,14 @@ fn rust_static_mut() {
     test.expect_wasm(expect_file!["./expected/static_mut.wat"]);
     test.expect_ir(expect_file!["./expected/static_mut.hir"]);
     assert!(
-        !test.hir.unwrap().unwrap_program().segments().last().unwrap().is_readonly(),
+        !test
+            .hir()
+            .unwrap_component()
+            .first_module()
+            .segments()
+            .last()
+            .unwrap()
+            .is_readonly(),
         "data segment should be mutable"
     );
 }
diff --git a/hir/src/component/mod.rs b/hir/src/component/mod.rs
index f9ac9a506..b97b9ca75 100644
--- a/hir/src/component/mod.rs
+++ b/hir/src/component/mod.rs
@@ -176,7 +176,15 @@ impl Component {
         &self.exports
     }
 
-    /// Extracts the single module from this component, panicking if there is not exactly one.
+    /// Get the first module in this component
+    pub fn first_module(&self) -> &Module {
+        self.modules
+            .values()
+            .next()
+            .expect("Expected at least one module in the component")
+    }
+
+    /// Extracts the single module consuming this component, panicking if there is not exactly one.
     pub fn unwrap_one_module(self) -> Box<Module> {
         assert_eq!(self.modules.len(), 1, "Expected exactly one module in the component");
         self.to_modules().drain(..).next().unwrap().1
@@ -316,6 +324,7 @@ impl<'a> ComponentBuilder<'a> {
     }
 
     pub fn build(self) -> Component {
+        assert!(!self.modules.is_empty(), "Cannot build a component with no modules");
         let mut c = Component::default();
         c.modules = self.modules;
         c.exports = self.exports;
diff --git a/tests/integration/expected/add_i16.hir b/tests/integration/expected/add_i16.hir
index 97096a336..14a40125f 100644
--- a/tests/integration/expected/add_i16.hir
+++ b/tests/integration/expected/add_i16.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (add.wrapping v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (add.wrapping v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/add_i16.masm b/tests/integration/expected/add_i16.masm
index d2d5d7af2..c527b6beb 100644
--- a/tests/integration/expected/add_i16.masm
+++ b/tests/integration/expected/add_i16.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c
 
 export.entrypoint
   u32wrapping_add
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c::entrypoint
 end
+
diff --git a/tests/integration/expected/add_i16.wat b/tests/integration/expected/add_i16.wat
index 10ba17120..6b360432a 100644
--- a/tests/integration/expected/add_i16.wat
+++ b/tests/integration/expected/add_i16.wat
@@ -1,4 +1,4 @@
-(module $bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c.wasm
+(module $test_rust_bbf5fdc0851222e92e718cc0af28212663b61bc643024537b3041e4528ea338c.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/add_i32.hir b/tests/integration/expected/add_i32.hir
index 97096a336..1d19342d9 100644
--- a/tests/integration/expected/add_i32.hir
+++ b/tests/integration/expected/add_i32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (add.wrapping v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (add.wrapping v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/add_i32.masm b/tests/integration/expected/add_i32.masm
index d2d5d7af2..a43ade938 100644
--- a/tests/integration/expected/add_i32.masm
+++ b/tests/integration/expected/add_i32.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b
 
 export.entrypoint
   u32wrapping_add
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b::entrypoint
 end
+
diff --git a/tests/integration/expected/add_i32.wat b/tests/integration/expected/add_i32.wat
index a7be118bf..94f7ac209 100644
--- a/tests/integration/expected/add_i32.wat
+++ b/tests/integration/expected/add_i32.wat
@@ -1,4 +1,4 @@
-(module $2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b.wasm
+(module $test_rust_2e60443dc47eecaf44c0755d01375597814229ddd052f66a9a8f52569d4bee8b.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/add_i8.hir b/tests/integration/expected/add_i8.hir
index 97096a336..0a734b2a8 100644
--- a/tests/integration/expected/add_i8.hir
+++ b/tests/integration/expected/add_i8.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (add.wrapping v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (add.wrapping v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/add_i8.masm b/tests/integration/expected/add_i8.masm
index d2d5d7af2..6632e7641 100644
--- a/tests/integration/expected/add_i8.masm
+++ b/tests/integration/expected/add_i8.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6
 
 export.entrypoint
   u32wrapping_add
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6::entrypoint
 end
+
diff --git a/tests/integration/expected/add_i8.wat b/tests/integration/expected/add_i8.wat
index 3926e5fc2..214f0a79d 100644
--- a/tests/integration/expected/add_i8.wat
+++ b/tests/integration/expected/add_i8.wat
@@ -1,4 +1,4 @@
-(module $aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6.wasm
+(module $test_rust_aa4e8ec18774f7791634833f5a14b633e4c1a7d4ec8ae07ec95668a9f3fb05d6.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/add_u16.hir b/tests/integration/expected/add_u16.hir
index f09b5e599..3f798df4c 100644
--- a/tests/integration/expected/add_u16.hir
+++ b/tests/integration/expected/add_u16.hir
@@ -1,18 +1,25 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (add.wrapping v1 v0))
-            (let (v4 i32) (const.i32 65535))
-            (let (v5 i32) (band v3 v4))
-            (ret v5))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (add.wrapping v1 v0))
+                (let (v4 i32) (const.i32 65535))
+                (let (v5 i32) (band v3 v4))
+                (br (block 1 v5)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/add_u16.masm b/tests/integration/expected/add_u16.masm
index fbad9a99c..b97ae981f 100644
--- a/tests/integration/expected/add_u16.masm
+++ b/tests/integration/expected/add_u16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d
 
 export.entrypoint
   u32wrapping_add
@@ -661,10 +6,11 @@ export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d::entrypoint
 end
+
diff --git a/tests/integration/expected/add_u16.wat b/tests/integration/expected/add_u16.wat
index 26c447ad3..7d9d4729b 100644
--- a/tests/integration/expected/add_u16.wat
+++ b/tests/integration/expected/add_u16.wat
@@ -1,4 +1,4 @@
-(module $10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d.wasm
+(module $test_rust_10c9fc505476d6021538a9abdcf2c4d73bd1d8cc42c25993867649bb63b4319d.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/add_u32.hir b/tests/integration/expected/add_u32.hir
index 97096a336..ee934d5ed 100644
--- a/tests/integration/expected/add_u32.hir
+++ b/tests/integration/expected/add_u32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (add.wrapping v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (add.wrapping v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/add_u32.masm b/tests/integration/expected/add_u32.masm
index d2d5d7af2..f5f46e868 100644
--- a/tests/integration/expected/add_u32.masm
+++ b/tests/integration/expected/add_u32.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35
 
 export.entrypoint
   u32wrapping_add
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35::entrypoint
 end
+
diff --git a/tests/integration/expected/add_u32.wat b/tests/integration/expected/add_u32.wat
index e8dbaed44..87c21d879 100644
--- a/tests/integration/expected/add_u32.wat
+++ b/tests/integration/expected/add_u32.wat
@@ -1,4 +1,4 @@
-(module $d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35.wasm
+(module $test_rust_d6a5f6b2fb9509a2986e40a5ab057ae035f5eeb6fb66c1c0bd59648ee4c31a35.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/add_u8.hir b/tests/integration/expected/add_u8.hir
index c365eae7e..55f61144f 100644
--- a/tests/integration/expected/add_u8.hir
+++ b/tests/integration/expected/add_u8.hir
@@ -1,18 +1,25 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (add.wrapping v1 v0))
-            (let (v4 i32) (const.i32 255))
-            (let (v5 i32) (band v3 v4))
-            (ret v5))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (add.wrapping v1 v0))
+                (let (v4 i32) (const.i32 255))
+                (let (v5 i32) (band v3 v4))
+                (br (block 1 v5)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/add_u8.masm b/tests/integration/expected/add_u8.masm
index 34f22f7d1..35fc0adb3 100644
--- a/tests/integration/expected/add_u8.masm
+++ b/tests/integration/expected/add_u8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3
 
 export.entrypoint
   u32wrapping_add
@@ -661,10 +6,11 @@ export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3::entrypoint
 end
+
diff --git a/tests/integration/expected/add_u8.wat b/tests/integration/expected/add_u8.wat
index 01755ac5e..e5b13c342 100644
--- a/tests/integration/expected/add_u8.wat
+++ b/tests/integration/expected/add_u8.wat
@@ -1,4 +1,4 @@
-(module $4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3.wasm
+(module $test_rust_4a87475b2f9d8d15ad35a776ff173dc1470f87cacd0a8312306b9896bb828aa3.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/and_bool.hir b/tests/integration/expected/and_bool.hir
index 69854d720..9ac7f8666 100644
--- a/tests/integration/expected/and_bool.hir
+++ b/tests/integration/expected/and_bool.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (band v0 v1))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (band v0 v1))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/and_bool.masm b/tests/integration/expected/and_bool.masm
index 2c3c6db33..0b3f68a3c 100644
--- a/tests/integration/expected/and_bool.masm
+++ b/tests/integration/expected/and_bool.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814
 
 export.entrypoint
   swap.1
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814::entrypoint
 end
+
diff --git a/tests/integration/expected/and_bool.wat b/tests/integration/expected/and_bool.wat
index 0128257e0..3bddcf619 100644
--- a/tests/integration/expected/and_bool.wat
+++ b/tests/integration/expected/and_bool.wat
@@ -1,4 +1,4 @@
-(module $4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814.wasm
+(module $test_rust_4ac99d1101f79650c02e85b18d774a8cfc696b791a33e4cbd07338faa6df2814.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/and_i16.hir b/tests/integration/expected/and_i16.hir
index 0c756b420..1c25668fa 100644
--- a/tests/integration/expected/and_i16.hir
+++ b/tests/integration/expected/and_i16.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (band v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (band v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/and_i16.masm b/tests/integration/expected/and_i16.masm
index 8ff0c42ac..da50f2fd3 100644
--- a/tests/integration/expected/and_i16.masm
+++ b/tests/integration/expected/and_i16.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40
 
 export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40::entrypoint
 end
+
diff --git a/tests/integration/expected/and_i16.wat b/tests/integration/expected/and_i16.wat
index 235d17d36..4a74cd24f 100644
--- a/tests/integration/expected/and_i16.wat
+++ b/tests/integration/expected/and_i16.wat
@@ -1,4 +1,4 @@
-(module $c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40.wasm
+(module $test_rust_c7e9cce9483c4fd7983b386cae179d4a54022802e0d6b932bccd80235b921c40.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/and_i32.hir b/tests/integration/expected/and_i32.hir
index 0c756b420..3dcc96b64 100644
--- a/tests/integration/expected/and_i32.hir
+++ b/tests/integration/expected/and_i32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (band v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (band v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/and_i32.masm b/tests/integration/expected/and_i32.masm
index 8ff0c42ac..41999f2e3 100644
--- a/tests/integration/expected/and_i32.masm
+++ b/tests/integration/expected/and_i32.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9
 
 export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9::entrypoint
 end
+
diff --git a/tests/integration/expected/and_i32.wat b/tests/integration/expected/and_i32.wat
index 37e77ee49..78064f54b 100644
--- a/tests/integration/expected/and_i32.wat
+++ b/tests/integration/expected/and_i32.wat
@@ -1,4 +1,4 @@
-(module $8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9.wasm
+(module $test_rust_8391b0d837d3b65b33c6b68ea552987952048935f4c45fadd58b81ea8ba141d9.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/and_i8.hir b/tests/integration/expected/and_i8.hir
index 0c756b420..c81cbbd30 100644
--- a/tests/integration/expected/and_i8.hir
+++ b/tests/integration/expected/and_i8.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (band v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (band v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/and_i8.masm b/tests/integration/expected/and_i8.masm
index 8ff0c42ac..129a4fe5d 100644
--- a/tests/integration/expected/and_i8.masm
+++ b/tests/integration/expected/and_i8.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31
 
 export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31::entrypoint
 end
+
diff --git a/tests/integration/expected/and_i8.wat b/tests/integration/expected/and_i8.wat
index e33b97c1d..9100fdae8 100644
--- a/tests/integration/expected/and_i8.wat
+++ b/tests/integration/expected/and_i8.wat
@@ -1,4 +1,4 @@
-(module $645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31.wasm
+(module $test_rust_645dc02b90fa56981e2f5305f2d8f5067bb8cdc2eb91b610298ef135bd758d31.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/and_u16.hir b/tests/integration/expected/and_u16.hir
index 0c756b420..f11129bf2 100644
--- a/tests/integration/expected/and_u16.hir
+++ b/tests/integration/expected/and_u16.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (band v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (band v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/and_u16.masm b/tests/integration/expected/and_u16.masm
index 8ff0c42ac..774fb0e73 100644
--- a/tests/integration/expected/and_u16.masm
+++ b/tests/integration/expected/and_u16.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810
 
 export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810::entrypoint
 end
+
diff --git a/tests/integration/expected/and_u16.wat b/tests/integration/expected/and_u16.wat
index 39a3d7091..9e3a24713 100644
--- a/tests/integration/expected/and_u16.wat
+++ b/tests/integration/expected/and_u16.wat
@@ -1,4 +1,4 @@
-(module $552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810.wasm
+(module $test_rust_552e799f48de5fcc388eaa5128c9842db9a9500f75f852887a429dbe8c67d810.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/and_u32.hir b/tests/integration/expected/and_u32.hir
index 0c756b420..0b6f9d8b2 100644
--- a/tests/integration/expected/and_u32.hir
+++ b/tests/integration/expected/and_u32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (band v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (band v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/and_u32.masm b/tests/integration/expected/and_u32.masm
index 8ff0c42ac..ba519d200 100644
--- a/tests/integration/expected/and_u32.masm
+++ b/tests/integration/expected/and_u32.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13
 
 export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13::entrypoint
 end
+
diff --git a/tests/integration/expected/and_u32.wat b/tests/integration/expected/and_u32.wat
index 1e9474754..2128d89d9 100644
--- a/tests/integration/expected/and_u32.wat
+++ b/tests/integration/expected/and_u32.wat
@@ -1,4 +1,4 @@
-(module $03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13.wasm
+(module $test_rust_03ecb06cdac4759a31c320b67e5a88995c8e5b0260bc540636a10106839a7c13.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/and_u8.hir b/tests/integration/expected/and_u8.hir
index 0c756b420..2264593a1 100644
--- a/tests/integration/expected/and_u8.hir
+++ b/tests/integration/expected/and_u8.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (band v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (band v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/and_u8.masm b/tests/integration/expected/and_u8.masm
index 8ff0c42ac..cfed08db9 100644
--- a/tests/integration/expected/and_u8.masm
+++ b/tests/integration/expected/and_u8.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650
 
 export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650::entrypoint
 end
+
diff --git a/tests/integration/expected/and_u8.wat b/tests/integration/expected/and_u8.wat
index 51f6d9c93..d5ade8eec 100644
--- a/tests/integration/expected/and_u8.wat
+++ b/tests/integration/expected/and_u8.wat
@@ -1,4 +1,4 @@
-(module $dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650.wasm
+(module $test_rust_dc5c0d94136b471b7115e3df5c99cd5b9ebfb25f4c88e0039211a30936a42650.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/eq_i16.hir b/tests/integration/expected/eq_i16.hir
index 4f884eca2..5c3a39c99 100644
--- a/tests/integration/expected/eq_i16.hir
+++ b/tests/integration/expected/eq_i16.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i1) (eq v0 v1))
-            (let (v4 i32) (cast v3))
-            (ret v4))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i1) (eq v0 v1))
+                (let (v4 i32) (cast v3))
+                (br (block 1 v4)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/eq_i16.masm b/tests/integration/expected/eq_i16.masm
index 2f2f1859a..8b544bef9 100644
--- a/tests/integration/expected/eq_i16.masm
+++ b/tests/integration/expected/eq_i16.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b
 
 export.entrypoint
   swap.1
   eq
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b::entrypoint
 end
+
diff --git a/tests/integration/expected/eq_i16.wat b/tests/integration/expected/eq_i16.wat
index 2806f78b2..08ddc7356 100644
--- a/tests/integration/expected/eq_i16.wat
+++ b/tests/integration/expected/eq_i16.wat
@@ -1,4 +1,4 @@
-(module $d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b.wasm
+(module $test_rust_d3eecc0932c0745000688bf699bae5c588052144cdbc0bc7c4ab37c3cc14cd7b.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/eq_i32.hir b/tests/integration/expected/eq_i32.hir
index 4f884eca2..d397892c5 100644
--- a/tests/integration/expected/eq_i32.hir
+++ b/tests/integration/expected/eq_i32.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i1) (eq v0 v1))
-            (let (v4 i32) (cast v3))
-            (ret v4))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i1) (eq v0 v1))
+                (let (v4 i32) (cast v3))
+                (br (block 1 v4)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/eq_i32.masm b/tests/integration/expected/eq_i32.masm
index 2f2f1859a..fdd8429d8 100644
--- a/tests/integration/expected/eq_i32.masm
+++ b/tests/integration/expected/eq_i32.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03
 
 export.entrypoint
   swap.1
   eq
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03::entrypoint
 end
+
diff --git a/tests/integration/expected/eq_i32.wat b/tests/integration/expected/eq_i32.wat
index 873562028..ecbd03e15 100644
--- a/tests/integration/expected/eq_i32.wat
+++ b/tests/integration/expected/eq_i32.wat
@@ -1,4 +1,4 @@
-(module $535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03.wasm
+(module $test_rust_535f5a5a2d649df390220a07008a31a5226ad26f1cf27c7849e47c754842ec03.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/eq_i64.hir b/tests/integration/expected/eq_i64.hir
index ff9ac6f26..1efb9d02c 100644
--- a/tests/integration/expected/eq_i64.hir
+++ b/tests/integration/expected/eq_i64.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i64) (param i64) (result i32)
-        (block 0 (param v0 i64) (param v1 i64)
-            (let (v3 i1) (eq v0 v1))
-            (let (v4 i32) (cast v3))
-            (ret v4))
+        ;; Functions
+        (func (export #entrypoint) (param i64) (param i64) (result i32)
+            (block 0 (param v0 i64) (param v1 i64)
+                (let (v3 i1) (eq v0 v1))
+                (let (v4 i32) (cast v3))
+                (br (block 1 v4)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/eq_i64.masm b/tests/integration/expected/eq_i64.masm
index 0fb2ce1b8..30087ce67 100644
--- a/tests/integration/expected/eq_i64.masm
+++ b/tests/integration/expected/eq_i64.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d
 
 export.entrypoint
   movdn.3
@@ -665,10 +10,11 @@ export.entrypoint
   and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d::entrypoint
 end
+
diff --git a/tests/integration/expected/eq_i64.wat b/tests/integration/expected/eq_i64.wat
index b4b882569..84956c72d 100644
--- a/tests/integration/expected/eq_i64.wat
+++ b/tests/integration/expected/eq_i64.wat
@@ -1,4 +1,4 @@
-(module $c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d.wasm
+(module $test_rust_c0b1348123b7005d1a5f70ddc2c38a3fc27e908c3656adebf0eae90cdbc8959d.wasm
   (type (;0;) (func (param i64 i64) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i64 i64) (result i32)
     local.get 0
diff --git a/tests/integration/expected/eq_i8.hir b/tests/integration/expected/eq_i8.hir
index 4f884eca2..46773a9a1 100644
--- a/tests/integration/expected/eq_i8.hir
+++ b/tests/integration/expected/eq_i8.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i1) (eq v0 v1))
-            (let (v4 i32) (cast v3))
-            (ret v4))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i1) (eq v0 v1))
+                (let (v4 i32) (cast v3))
+                (br (block 1 v4)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/eq_i8.masm b/tests/integration/expected/eq_i8.masm
index 2f2f1859a..d603464f4 100644
--- a/tests/integration/expected/eq_i8.masm
+++ b/tests/integration/expected/eq_i8.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a
 
 export.entrypoint
   swap.1
   eq
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a::entrypoint
 end
+
diff --git a/tests/integration/expected/eq_i8.wat b/tests/integration/expected/eq_i8.wat
index 15ddad5a4..8627fe4b6 100644
--- a/tests/integration/expected/eq_i8.wat
+++ b/tests/integration/expected/eq_i8.wat
@@ -1,4 +1,4 @@
-(module $58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a.wasm
+(module $test_rust_58aae86db503f25d519c45a178d348c9fa62ad89779c3a7beb32041962ccbd8a.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/eq_u16.hir b/tests/integration/expected/eq_u16.hir
index 4f884eca2..86a82c857 100644
--- a/tests/integration/expected/eq_u16.hir
+++ b/tests/integration/expected/eq_u16.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i1) (eq v0 v1))
-            (let (v4 i32) (cast v3))
-            (ret v4))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i1) (eq v0 v1))
+                (let (v4 i32) (cast v3))
+                (br (block 1 v4)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/eq_u16.masm b/tests/integration/expected/eq_u16.masm
index 2f2f1859a..8e2671dbd 100644
--- a/tests/integration/expected/eq_u16.masm
+++ b/tests/integration/expected/eq_u16.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d
 
 export.entrypoint
   swap.1
   eq
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d::entrypoint
 end
+
diff --git a/tests/integration/expected/eq_u16.wat b/tests/integration/expected/eq_u16.wat
index f4447c7b6..90fa5b025 100644
--- a/tests/integration/expected/eq_u16.wat
+++ b/tests/integration/expected/eq_u16.wat
@@ -1,4 +1,4 @@
-(module $bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d.wasm
+(module $test_rust_bf5c0ccc66e1188e428efe75b85c06065d267030df6b1c191b2ee935ea27795d.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/eq_u32.hir b/tests/integration/expected/eq_u32.hir
index 4f884eca2..6f96cbd3d 100644
--- a/tests/integration/expected/eq_u32.hir
+++ b/tests/integration/expected/eq_u32.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i1) (eq v0 v1))
-            (let (v4 i32) (cast v3))
-            (ret v4))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i1) (eq v0 v1))
+                (let (v4 i32) (cast v3))
+                (br (block 1 v4)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/eq_u32.masm b/tests/integration/expected/eq_u32.masm
index 2f2f1859a..48d6bcfdf 100644
--- a/tests/integration/expected/eq_u32.masm
+++ b/tests/integration/expected/eq_u32.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e
 
 export.entrypoint
   swap.1
   eq
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e::entrypoint
 end
+
diff --git a/tests/integration/expected/eq_u32.wat b/tests/integration/expected/eq_u32.wat
index dd3177adf..be0656544 100644
--- a/tests/integration/expected/eq_u32.wat
+++ b/tests/integration/expected/eq_u32.wat
@@ -1,4 +1,4 @@
-(module $8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e.wasm
+(module $test_rust_8fb01b80f31505a22343d7c26e3474f1160b5bf9f9048fa61561f108ac0be95e.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/eq_u64.hir b/tests/integration/expected/eq_u64.hir
index ff9ac6f26..f4001823c 100644
--- a/tests/integration/expected/eq_u64.hir
+++ b/tests/integration/expected/eq_u64.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i64) (param i64) (result i32)
-        (block 0 (param v0 i64) (param v1 i64)
-            (let (v3 i1) (eq v0 v1))
-            (let (v4 i32) (cast v3))
-            (ret v4))
+        ;; Functions
+        (func (export #entrypoint) (param i64) (param i64) (result i32)
+            (block 0 (param v0 i64) (param v1 i64)
+                (let (v3 i1) (eq v0 v1))
+                (let (v4 i32) (cast v3))
+                (br (block 1 v4)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/eq_u64.masm b/tests/integration/expected/eq_u64.masm
index 0fb2ce1b8..12f014df1 100644
--- a/tests/integration/expected/eq_u64.masm
+++ b/tests/integration/expected/eq_u64.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f
 
 export.entrypoint
   movdn.3
@@ -665,10 +10,11 @@ export.entrypoint
   and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f::entrypoint
 end
+
diff --git a/tests/integration/expected/eq_u64.wat b/tests/integration/expected/eq_u64.wat
index aae9d19c8..6c4b5c733 100644
--- a/tests/integration/expected/eq_u64.wat
+++ b/tests/integration/expected/eq_u64.wat
@@ -1,4 +1,4 @@
-(module $23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f.wasm
+(module $test_rust_23a27398cbfb7447cb610e7b877565f4e43d633b55f98504051b93381d40740f.wasm
   (type (;0;) (func (param i64 i64) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i64 i64) (result i32)
     local.get 0
diff --git a/tests/integration/expected/eq_u8.hir b/tests/integration/expected/eq_u8.hir
index 4f884eca2..83392aa99 100644
--- a/tests/integration/expected/eq_u8.hir
+++ b/tests/integration/expected/eq_u8.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_016edfcf5844ac44aa96bfe0cfac241307bf2ff2adbb955edec051f22a2332a9
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i1) (eq v0 v1))
-            (let (v4 i32) (cast v3))
-            (ret v4))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i1) (eq v0 v1))
+                (let (v4 i32) (cast v3))
+                (br (block 1 v4)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/eq_u8.masm b/tests/integration/expected/eq_u8.masm
index 2f2f1859a..0079f0f32 100644
--- a/tests/integration/expected/eq_u8.masm
+++ b/tests/integration/expected/eq_u8.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_016edfcf5844ac44aa96bfe0cfac241307bf2ff2adbb955edec051f22a2332a9
 
 export.entrypoint
   swap.1
   eq
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_016edfcf5844ac44aa96bfe0cfac241307bf2ff2adbb955edec051f22a2332a9
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_016edfcf5844ac44aa96bfe0cfac241307bf2ff2adbb955edec051f22a2332a9::entrypoint
 end
+
diff --git a/tests/integration/expected/eq_u8.wat b/tests/integration/expected/eq_u8.wat
index a310f726c..f6a30d683 100644
--- a/tests/integration/expected/eq_u8.wat
+++ b/tests/integration/expected/eq_u8.wat
@@ -1,4 +1,4 @@
-(module $016edfcf5844ac44aa96bfe0cfac241307bf2ff2adbb955edec051f22a2332a9.wasm
+(module $test_rust_016edfcf5844ac44aa96bfe0cfac241307bf2ff2adbb955edec051f22a2332a9.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/fib.hir b/tests/integration/expected/fib.hir
index b28549c44..e4d110806 100644
--- a/tests/integration/expected/fib.hir
+++ b/tests/integration/expected/fib.hir
@@ -1,35 +1,39 @@
-(module #miden_integration_tests_rust_fib_wasm
-    ;; Constants
-    (const (id 0) 0x00100000)
-
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
-
-    ;; Functions
-    (func (export #fib) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 0))
-            (let (v3 i32) (const.i32 0))
-            (let (v4 i32) (const.i32 1))
-            (br (block 2 v4 v0 v3)))
-
-        (block 1 (param v1 i32))
-
-        (block 2 (param v6 i32) (param v7 i32) (param v9 i32)
-            (let (v8 i1) (neq v7 0))
-            (condbr v8 (block 4) (block 5)))
-
-        (block 3 (param v5 i32))
-
-        (block 4
-            (let (v10 i32) (const.i32 -1))
-            (let (v11 i32) (add.wrapping v7 v10))
-            (let (v12 i32) (add.wrapping v9 v6))
-            (br (block 2 v12 v11 v6)))
-
-        (block 5
-            (ret v9))
+(component 
+    ;; Modules
+    (module #miden_integration_tests_rust_fib_wasm
+        ;; Constants
+        (const (id 0) 0x00100000)
+
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
+
+        ;; Functions
+        (func (export #fib) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 0))
+                (let (v3 i32) (const.i32 0))
+                (let (v4 i32) (const.i32 1))
+                (br (block 2 v4 v0 v3)))
+
+            (block 1 (param v1 i32))
+
+            (block 2 (param v6 i32) (param v7 i32) (param v9 i32)
+                (let (v8 i1) (neq v7 0))
+                (condbr v8 (block 4) (block 5)))
+
+            (block 3 (param v5 i32))
+
+            (block 4
+                (let (v10 i32) (const.i32 -1))
+                (let (v11 i32) (add.wrapping v7 v10))
+                (let (v12 i32) (add.wrapping v9 v6))
+                (br (block 2 v12 v11 v6)))
+
+            (block 5
+                (ret v9))
+        )
     )
+
 )
diff --git a/tests/integration/expected/fib.masm b/tests/integration/expected/fib.masm
index 801a8e8c9..536a2c92a 100644
--- a/tests/integration/expected/fib.masm
+++ b/tests/integration/expected/fib.masm
@@ -1,658 +1,3 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
 mod miden_integration_tests_rust_fib_wasm
 
 export.fib
@@ -687,10 +32,11 @@ export.fib
   end
 end
 
-program
+mod zzz_entrypoint_module
 
-use miden_integration_tests_rust_fib_wasm
+use.miden_integration_tests_rust_fib_wasm
 
-begin
+export.entrypoint_wrapper
   exec.miden_integration_tests_rust_fib_wasm::fib
 end
+
diff --git a/tests/integration/expected/ge_u16.hir b/tests/integration/expected/ge_u16.hir
index f95d0b2cc..e5c9ff9d3 100644
--- a/tests/integration/expected/ge_u16.hir
+++ b/tests/integration/expected/ge_u16.hir
@@ -1,19 +1,26 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_76b95aeb59987e43311d2fb22a7021b58c09a51fe7457153d1a9986095f5038e
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 u32) (cast v0))
-            (let (v4 u32) (cast v1))
-            (let (v5 i1) (gte v3 v4))
-            (let (v6 i32) (cast v5))
-            (ret v6))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 u32) (cast v0))
+                (let (v4 u32) (cast v1))
+                (let (v5 i1) (gte v3 v4))
+                (let (v6 i32) (cast v5))
+                (br (block 1 v6)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/ge_u16.masm b/tests/integration/expected/ge_u16.masm
index 3512a445d..167302ca1 100644
--- a/tests/integration/expected/ge_u16.masm
+++ b/tests/integration/expected/ge_u16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_76b95aeb59987e43311d2fb22a7021b58c09a51fe7457153d1a9986095f5038e
 
 export.entrypoint
   dup.0
@@ -670,10 +15,11 @@ export.entrypoint
   u32gte
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_76b95aeb59987e43311d2fb22a7021b58c09a51fe7457153d1a9986095f5038e
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_76b95aeb59987e43311d2fb22a7021b58c09a51fe7457153d1a9986095f5038e::entrypoint
 end
+
diff --git a/tests/integration/expected/ge_u16.wat b/tests/integration/expected/ge_u16.wat
index 8fcc07f93..d74625720 100644
--- a/tests/integration/expected/ge_u16.wat
+++ b/tests/integration/expected/ge_u16.wat
@@ -1,4 +1,4 @@
-(module $76b95aeb59987e43311d2fb22a7021b58c09a51fe7457153d1a9986095f5038e.wasm
+(module $test_rust_76b95aeb59987e43311d2fb22a7021b58c09a51fe7457153d1a9986095f5038e.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/ge_u8.hir b/tests/integration/expected/ge_u8.hir
index f95d0b2cc..5370b1f79 100644
--- a/tests/integration/expected/ge_u8.hir
+++ b/tests/integration/expected/ge_u8.hir
@@ -1,19 +1,26 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_54b0c7ea89a992ede15df4270d53ad3910db016fdef9484347e14e8583439818
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 u32) (cast v0))
-            (let (v4 u32) (cast v1))
-            (let (v5 i1) (gte v3 v4))
-            (let (v6 i32) (cast v5))
-            (ret v6))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 u32) (cast v0))
+                (let (v4 u32) (cast v1))
+                (let (v5 i1) (gte v3 v4))
+                (let (v6 i32) (cast v5))
+                (br (block 1 v6)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/ge_u8.masm b/tests/integration/expected/ge_u8.masm
index 3512a445d..57603b5a7 100644
--- a/tests/integration/expected/ge_u8.masm
+++ b/tests/integration/expected/ge_u8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_54b0c7ea89a992ede15df4270d53ad3910db016fdef9484347e14e8583439818
 
 export.entrypoint
   dup.0
@@ -670,10 +15,11 @@ export.entrypoint
   u32gte
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_54b0c7ea89a992ede15df4270d53ad3910db016fdef9484347e14e8583439818
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_54b0c7ea89a992ede15df4270d53ad3910db016fdef9484347e14e8583439818::entrypoint
 end
+
diff --git a/tests/integration/expected/ge_u8.wat b/tests/integration/expected/ge_u8.wat
index 3332a5150..21286350d 100644
--- a/tests/integration/expected/ge_u8.wat
+++ b/tests/integration/expected/ge_u8.wat
@@ -1,4 +1,4 @@
-(module $54b0c7ea89a992ede15df4270d53ad3910db016fdef9484347e14e8583439818.wasm
+(module $test_rust_54b0c7ea89a992ede15df4270d53ad3910db016fdef9484347e14e8583439818.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/gt_u16.hir b/tests/integration/expected/gt_u16.hir
index bf862a639..f5fff5d82 100644
--- a/tests/integration/expected/gt_u16.hir
+++ b/tests/integration/expected/gt_u16.hir
@@ -1,19 +1,26 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_1f3e71115fc0280c196e968bdc849a389f4cde61e22ba8a528fd4008c3dda439
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 u32) (cast v0))
-            (let (v4 u32) (cast v1))
-            (let (v5 i1) (gt v3 v4))
-            (let (v6 i32) (cast v5))
-            (ret v6))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 u32) (cast v0))
+                (let (v4 u32) (cast v1))
+                (let (v5 i1) (gt v3 v4))
+                (let (v6 i32) (cast v5))
+                (br (block 1 v6)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/gt_u16.masm b/tests/integration/expected/gt_u16.masm
index 418e06bc6..122cac108 100644
--- a/tests/integration/expected/gt_u16.masm
+++ b/tests/integration/expected/gt_u16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_1f3e71115fc0280c196e968bdc849a389f4cde61e22ba8a528fd4008c3dda439
 
 export.entrypoint
   dup.0
@@ -670,10 +15,11 @@ export.entrypoint
   u32gt
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_1f3e71115fc0280c196e968bdc849a389f4cde61e22ba8a528fd4008c3dda439
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_1f3e71115fc0280c196e968bdc849a389f4cde61e22ba8a528fd4008c3dda439::entrypoint
 end
+
diff --git a/tests/integration/expected/gt_u16.wat b/tests/integration/expected/gt_u16.wat
index 3bef31cb0..fb659a0b7 100644
--- a/tests/integration/expected/gt_u16.wat
+++ b/tests/integration/expected/gt_u16.wat
@@ -1,4 +1,4 @@
-(module $1f3e71115fc0280c196e968bdc849a389f4cde61e22ba8a528fd4008c3dda439.wasm
+(module $test_rust_1f3e71115fc0280c196e968bdc849a389f4cde61e22ba8a528fd4008c3dda439.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/gt_u8.hir b/tests/integration/expected/gt_u8.hir
index bf862a639..7c5e6b6b7 100644
--- a/tests/integration/expected/gt_u8.hir
+++ b/tests/integration/expected/gt_u8.hir
@@ -1,19 +1,26 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_9ff23d66c653e992b6e1b92ca070ee51c8fb198f18a46cf1f931db5256d81673
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 u32) (cast v0))
-            (let (v4 u32) (cast v1))
-            (let (v5 i1) (gt v3 v4))
-            (let (v6 i32) (cast v5))
-            (ret v6))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 u32) (cast v0))
+                (let (v4 u32) (cast v1))
+                (let (v5 i1) (gt v3 v4))
+                (let (v6 i32) (cast v5))
+                (br (block 1 v6)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/gt_u8.masm b/tests/integration/expected/gt_u8.masm
index 418e06bc6..efc598650 100644
--- a/tests/integration/expected/gt_u8.masm
+++ b/tests/integration/expected/gt_u8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_9ff23d66c653e992b6e1b92ca070ee51c8fb198f18a46cf1f931db5256d81673
 
 export.entrypoint
   dup.0
@@ -670,10 +15,11 @@ export.entrypoint
   u32gt
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_9ff23d66c653e992b6e1b92ca070ee51c8fb198f18a46cf1f931db5256d81673
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_9ff23d66c653e992b6e1b92ca070ee51c8fb198f18a46cf1f931db5256d81673::entrypoint
 end
+
diff --git a/tests/integration/expected/gt_u8.wat b/tests/integration/expected/gt_u8.wat
index 6097e329b..56b088d72 100644
--- a/tests/integration/expected/gt_u8.wat
+++ b/tests/integration/expected/gt_u8.wat
@@ -1,4 +1,4 @@
-(module $9ff23d66c653e992b6e1b92ca070ee51c8fb198f18a46cf1f931db5256d81673.wasm
+(module $test_rust_9ff23d66c653e992b6e1b92ca070ee51c8fb198f18a46cf1f931db5256d81673.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/le_u16.hir b/tests/integration/expected/le_u16.hir
index 494419c53..33dc47398 100644
--- a/tests/integration/expected/le_u16.hir
+++ b/tests/integration/expected/le_u16.hir
@@ -1,19 +1,26 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_ff0a06076c996bca51493fe83ecb25fcda9ae22252704c128b49117365264974
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 u32) (cast v0))
-            (let (v4 u32) (cast v1))
-            (let (v5 i1) (lte v3 v4))
-            (let (v6 i32) (cast v5))
-            (ret v6))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 u32) (cast v0))
+                (let (v4 u32) (cast v1))
+                (let (v5 i1) (lte v3 v4))
+                (let (v6 i32) (cast v5))
+                (br (block 1 v6)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/le_u16.masm b/tests/integration/expected/le_u16.masm
index ee4ab1741..5948f784d 100644
--- a/tests/integration/expected/le_u16.masm
+++ b/tests/integration/expected/le_u16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_ff0a06076c996bca51493fe83ecb25fcda9ae22252704c128b49117365264974
 
 export.entrypoint
   dup.0
@@ -670,10 +15,11 @@ export.entrypoint
   u32lte
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_ff0a06076c996bca51493fe83ecb25fcda9ae22252704c128b49117365264974
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_ff0a06076c996bca51493fe83ecb25fcda9ae22252704c128b49117365264974::entrypoint
 end
+
diff --git a/tests/integration/expected/le_u16.wat b/tests/integration/expected/le_u16.wat
index c29446393..3eac5c4b8 100644
--- a/tests/integration/expected/le_u16.wat
+++ b/tests/integration/expected/le_u16.wat
@@ -1,4 +1,4 @@
-(module $ff0a06076c996bca51493fe83ecb25fcda9ae22252704c128b49117365264974.wasm
+(module $test_rust_ff0a06076c996bca51493fe83ecb25fcda9ae22252704c128b49117365264974.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/le_u8.hir b/tests/integration/expected/le_u8.hir
index 494419c53..ea2478e1c 100644
--- a/tests/integration/expected/le_u8.hir
+++ b/tests/integration/expected/le_u8.hir
@@ -1,19 +1,26 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_90833d097291d3eaef34c669d42686006454d4265170e39f4f3da9191cdf4b91
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 u32) (cast v0))
-            (let (v4 u32) (cast v1))
-            (let (v5 i1) (lte v3 v4))
-            (let (v6 i32) (cast v5))
-            (ret v6))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 u32) (cast v0))
+                (let (v4 u32) (cast v1))
+                (let (v5 i1) (lte v3 v4))
+                (let (v6 i32) (cast v5))
+                (br (block 1 v6)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/le_u8.masm b/tests/integration/expected/le_u8.masm
index ee4ab1741..1ef01af45 100644
--- a/tests/integration/expected/le_u8.masm
+++ b/tests/integration/expected/le_u8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_90833d097291d3eaef34c669d42686006454d4265170e39f4f3da9191cdf4b91
 
 export.entrypoint
   dup.0
@@ -670,10 +15,11 @@ export.entrypoint
   u32lte
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_90833d097291d3eaef34c669d42686006454d4265170e39f4f3da9191cdf4b91
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_90833d097291d3eaef34c669d42686006454d4265170e39f4f3da9191cdf4b91::entrypoint
 end
+
diff --git a/tests/integration/expected/le_u8.wat b/tests/integration/expected/le_u8.wat
index a5d857b47..0e4092d01 100644
--- a/tests/integration/expected/le_u8.wat
+++ b/tests/integration/expected/le_u8.wat
@@ -1,4 +1,4 @@
-(module $90833d097291d3eaef34c669d42686006454d4265170e39f4f3da9191cdf4b91.wasm
+(module $test_rust_90833d097291d3eaef34c669d42686006454d4265170e39f4f3da9191cdf4b91.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/lt_u16.hir b/tests/integration/expected/lt_u16.hir
index 25c83c440..20101719c 100644
--- a/tests/integration/expected/lt_u16.hir
+++ b/tests/integration/expected/lt_u16.hir
@@ -1,19 +1,26 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_5c07628ec4d9ea05c0cb5402aea23aecccfbd786cb513f138b2395cb26c88212
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 u32) (cast v0))
-            (let (v4 u32) (cast v1))
-            (let (v5 i1) (lt v3 v4))
-            (let (v6 i32) (cast v5))
-            (ret v6))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 u32) (cast v0))
+                (let (v4 u32) (cast v1))
+                (let (v5 i1) (lt v3 v4))
+                (let (v6 i32) (cast v5))
+                (br (block 1 v6)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/lt_u16.masm b/tests/integration/expected/lt_u16.masm
index 6bb50b9ec..c4b9048df 100644
--- a/tests/integration/expected/lt_u16.masm
+++ b/tests/integration/expected/lt_u16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_5c07628ec4d9ea05c0cb5402aea23aecccfbd786cb513f138b2395cb26c88212
 
 export.entrypoint
   dup.0
@@ -670,10 +15,11 @@ export.entrypoint
   u32lt
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_5c07628ec4d9ea05c0cb5402aea23aecccfbd786cb513f138b2395cb26c88212
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_5c07628ec4d9ea05c0cb5402aea23aecccfbd786cb513f138b2395cb26c88212::entrypoint
 end
+
diff --git a/tests/integration/expected/lt_u16.wat b/tests/integration/expected/lt_u16.wat
index d144bec83..0d8c64fbd 100644
--- a/tests/integration/expected/lt_u16.wat
+++ b/tests/integration/expected/lt_u16.wat
@@ -1,4 +1,4 @@
-(module $5c07628ec4d9ea05c0cb5402aea23aecccfbd786cb513f138b2395cb26c88212.wasm
+(module $test_rust_5c07628ec4d9ea05c0cb5402aea23aecccfbd786cb513f138b2395cb26c88212.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/lt_u8.hir b/tests/integration/expected/lt_u8.hir
index 25c83c440..72a8741bf 100644
--- a/tests/integration/expected/lt_u8.hir
+++ b/tests/integration/expected/lt_u8.hir
@@ -1,19 +1,26 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_3af3eb760fd15a611df682ed67144a5abe767c638e3c0c928720d59e06e5a5ee
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 u32) (cast v0))
-            (let (v4 u32) (cast v1))
-            (let (v5 i1) (lt v3 v4))
-            (let (v6 i32) (cast v5))
-            (ret v6))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 u32) (cast v0))
+                (let (v4 u32) (cast v1))
+                (let (v5 i1) (lt v3 v4))
+                (let (v6 i32) (cast v5))
+                (br (block 1 v6)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/lt_u8.masm b/tests/integration/expected/lt_u8.masm
index 6bb50b9ec..1396cea6f 100644
--- a/tests/integration/expected/lt_u8.masm
+++ b/tests/integration/expected/lt_u8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_3af3eb760fd15a611df682ed67144a5abe767c638e3c0c928720d59e06e5a5ee
 
 export.entrypoint
   dup.0
@@ -670,10 +15,11 @@ export.entrypoint
   u32lt
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_3af3eb760fd15a611df682ed67144a5abe767c638e3c0c928720d59e06e5a5ee
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_3af3eb760fd15a611df682ed67144a5abe767c638e3c0c928720d59e06e5a5ee::entrypoint
 end
+
diff --git a/tests/integration/expected/lt_u8.wat b/tests/integration/expected/lt_u8.wat
index 75706c8c2..f5dfb69c5 100644
--- a/tests/integration/expected/lt_u8.wat
+++ b/tests/integration/expected/lt_u8.wat
@@ -1,4 +1,4 @@
-(module $3af3eb760fd15a611df682ed67144a5abe767c638e3c0c928720d59e06e5a5ee.wasm
+(module $test_rust_3af3eb760fd15a611df682ed67144a5abe767c638e3c0c928720d59e06e5a5ee.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/neg_i16.hir b/tests/integration/expected/neg_i16.hir
index 57df58c20..4e5d4ecac 100644
--- a/tests/integration/expected/neg_i16.hir
+++ b/tests/integration/expected/neg_i16.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_8885ff83d4718aec39ee91baf1b6d9155897ac6940d8acb4ee8af80ac24d7630
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 0))
-            (let (v3 i32) (sub.wrapping v2 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 0))
+                (let (v3 i32) (sub.wrapping v2 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/neg_i16.masm b/tests/integration/expected/neg_i16.masm
index c1a2a1833..1badc11e9 100644
--- a/tests/integration/expected/neg_i16.masm
+++ b/tests/integration/expected/neg_i16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_8885ff83d4718aec39ee91baf1b6d9155897ac6940d8acb4ee8af80ac24d7630
 
 export.entrypoint
   push.0
@@ -661,10 +6,11 @@ export.entrypoint
   u32wrapping_sub
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_8885ff83d4718aec39ee91baf1b6d9155897ac6940d8acb4ee8af80ac24d7630
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_8885ff83d4718aec39ee91baf1b6d9155897ac6940d8acb4ee8af80ac24d7630::entrypoint
 end
+
diff --git a/tests/integration/expected/neg_i16.wat b/tests/integration/expected/neg_i16.wat
index 70a14adfe..66715dce3 100644
--- a/tests/integration/expected/neg_i16.wat
+++ b/tests/integration/expected/neg_i16.wat
@@ -1,4 +1,4 @@
-(module $8885ff83d4718aec39ee91baf1b6d9155897ac6940d8acb4ee8af80ac24d7630.wasm
+(module $test_rust_8885ff83d4718aec39ee91baf1b6d9155897ac6940d8acb4ee8af80ac24d7630.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     i32.const 0
diff --git a/tests/integration/expected/neg_i32.hir b/tests/integration/expected/neg_i32.hir
index 57df58c20..674824860 100644
--- a/tests/integration/expected/neg_i32.hir
+++ b/tests/integration/expected/neg_i32.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_4d99fac9eee91dee5488ef87e46cd372efb54cac7088374c284c7fe1d592975b
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 0))
-            (let (v3 i32) (sub.wrapping v2 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 0))
+                (let (v3 i32) (sub.wrapping v2 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/neg_i32.masm b/tests/integration/expected/neg_i32.masm
index c1a2a1833..3c99e8f5a 100644
--- a/tests/integration/expected/neg_i32.masm
+++ b/tests/integration/expected/neg_i32.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_4d99fac9eee91dee5488ef87e46cd372efb54cac7088374c284c7fe1d592975b
 
 export.entrypoint
   push.0
@@ -661,10 +6,11 @@ export.entrypoint
   u32wrapping_sub
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_4d99fac9eee91dee5488ef87e46cd372efb54cac7088374c284c7fe1d592975b
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_4d99fac9eee91dee5488ef87e46cd372efb54cac7088374c284c7fe1d592975b::entrypoint
 end
+
diff --git a/tests/integration/expected/neg_i32.wat b/tests/integration/expected/neg_i32.wat
index f11fb622c..5df529183 100644
--- a/tests/integration/expected/neg_i32.wat
+++ b/tests/integration/expected/neg_i32.wat
@@ -1,4 +1,4 @@
-(module $4d99fac9eee91dee5488ef87e46cd372efb54cac7088374c284c7fe1d592975b.wasm
+(module $test_rust_4d99fac9eee91dee5488ef87e46cd372efb54cac7088374c284c7fe1d592975b.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     i32.const 0
diff --git a/tests/integration/expected/neg_i8.hir b/tests/integration/expected/neg_i8.hir
index 57df58c20..f67cc7fb5 100644
--- a/tests/integration/expected/neg_i8.hir
+++ b/tests/integration/expected/neg_i8.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_a39cb19de351625b19b45683e68f0c391a8f9d3ac2c0b47dfe1db9e27887fc29
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 0))
-            (let (v3 i32) (sub.wrapping v2 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 0))
+                (let (v3 i32) (sub.wrapping v2 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/neg_i8.masm b/tests/integration/expected/neg_i8.masm
index c1a2a1833..eca357dee 100644
--- a/tests/integration/expected/neg_i8.masm
+++ b/tests/integration/expected/neg_i8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_a39cb19de351625b19b45683e68f0c391a8f9d3ac2c0b47dfe1db9e27887fc29
 
 export.entrypoint
   push.0
@@ -661,10 +6,11 @@ export.entrypoint
   u32wrapping_sub
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_a39cb19de351625b19b45683e68f0c391a8f9d3ac2c0b47dfe1db9e27887fc29
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_a39cb19de351625b19b45683e68f0c391a8f9d3ac2c0b47dfe1db9e27887fc29::entrypoint
 end
+
diff --git a/tests/integration/expected/neg_i8.wat b/tests/integration/expected/neg_i8.wat
index 0c72babbe..a607522b8 100644
--- a/tests/integration/expected/neg_i8.wat
+++ b/tests/integration/expected/neg_i8.wat
@@ -1,4 +1,4 @@
-(module $a39cb19de351625b19b45683e68f0c391a8f9d3ac2c0b47dfe1db9e27887fc29.wasm
+(module $test_rust_a39cb19de351625b19b45683e68f0c391a8f9d3ac2c0b47dfe1db9e27887fc29.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     i32.const 0
diff --git a/tests/integration/expected/not_bool.hir b/tests/integration/expected/not_bool.hir
index f4feb283b..4e5141df0 100644
--- a/tests/integration/expected/not_bool.hir
+++ b/tests/integration/expected/not_bool.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_9eeb808d5b84e9923aca025d19ce8860aa1591ec14e265ab55978490184941f9
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 1))
-            (let (v3 i32) (bxor v0 v2))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 1))
+                (let (v3 i32) (bxor v0 v2))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/not_bool.masm b/tests/integration/expected/not_bool.masm
index 9728b1edf..08c7fc4cd 100644
--- a/tests/integration/expected/not_bool.masm
+++ b/tests/integration/expected/not_bool.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_9eeb808d5b84e9923aca025d19ce8860aa1591ec14e265ab55978490184941f9
 
 export.entrypoint
   push.1
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_9eeb808d5b84e9923aca025d19ce8860aa1591ec14e265ab55978490184941f9
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_9eeb808d5b84e9923aca025d19ce8860aa1591ec14e265ab55978490184941f9::entrypoint
 end
+
diff --git a/tests/integration/expected/not_bool.wat b/tests/integration/expected/not_bool.wat
index e0c495c61..131009e3b 100644
--- a/tests/integration/expected/not_bool.wat
+++ b/tests/integration/expected/not_bool.wat
@@ -1,4 +1,4 @@
-(module $9eeb808d5b84e9923aca025d19ce8860aa1591ec14e265ab55978490184941f9.wasm
+(module $test_rust_9eeb808d5b84e9923aca025d19ce8860aa1591ec14e265ab55978490184941f9.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/not_i16.hir b/tests/integration/expected/not_i16.hir
index 344370c8b..b404a3f50 100644
--- a/tests/integration/expected/not_i16.hir
+++ b/tests/integration/expected/not_i16.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_8fa57435a0704052eef5cf543da239dc56a277e303737da31ead024a9331a727
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 -1))
-            (let (v3 i32) (bxor v0 v2))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 -1))
+                (let (v3 i32) (bxor v0 v2))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/not_i16.masm b/tests/integration/expected/not_i16.masm
index 14672b8ca..8e06ee9fb 100644
--- a/tests/integration/expected/not_i16.masm
+++ b/tests/integration/expected/not_i16.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_8fa57435a0704052eef5cf543da239dc56a277e303737da31ead024a9331a727
 
 export.entrypoint
   push.4294967295
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_8fa57435a0704052eef5cf543da239dc56a277e303737da31ead024a9331a727
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_8fa57435a0704052eef5cf543da239dc56a277e303737da31ead024a9331a727::entrypoint
 end
+
diff --git a/tests/integration/expected/not_i16.wat b/tests/integration/expected/not_i16.wat
index f6080eccf..0d7895a1d 100644
--- a/tests/integration/expected/not_i16.wat
+++ b/tests/integration/expected/not_i16.wat
@@ -1,4 +1,4 @@
-(module $8fa57435a0704052eef5cf543da239dc56a277e303737da31ead024a9331a727.wasm
+(module $test_rust_8fa57435a0704052eef5cf543da239dc56a277e303737da31ead024a9331a727.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/not_i32.hir b/tests/integration/expected/not_i32.hir
index 344370c8b..092b4490b 100644
--- a/tests/integration/expected/not_i32.hir
+++ b/tests/integration/expected/not_i32.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_2025dc1efddce491d35a4bd97da58ce6432ab90aaa631eb386fc77f975594744
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 -1))
-            (let (v3 i32) (bxor v0 v2))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 -1))
+                (let (v3 i32) (bxor v0 v2))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/not_i32.masm b/tests/integration/expected/not_i32.masm
index 14672b8ca..1ddb86d9d 100644
--- a/tests/integration/expected/not_i32.masm
+++ b/tests/integration/expected/not_i32.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_2025dc1efddce491d35a4bd97da58ce6432ab90aaa631eb386fc77f975594744
 
 export.entrypoint
   push.4294967295
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_2025dc1efddce491d35a4bd97da58ce6432ab90aaa631eb386fc77f975594744
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_2025dc1efddce491d35a4bd97da58ce6432ab90aaa631eb386fc77f975594744::entrypoint
 end
+
diff --git a/tests/integration/expected/not_i32.wat b/tests/integration/expected/not_i32.wat
index 9cf7f38c1..482f939b4 100644
--- a/tests/integration/expected/not_i32.wat
+++ b/tests/integration/expected/not_i32.wat
@@ -1,4 +1,4 @@
-(module $2025dc1efddce491d35a4bd97da58ce6432ab90aaa631eb386fc77f975594744.wasm
+(module $test_rust_2025dc1efddce491d35a4bd97da58ce6432ab90aaa631eb386fc77f975594744.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/not_i8.hir b/tests/integration/expected/not_i8.hir
index 344370c8b..331909a7b 100644
--- a/tests/integration/expected/not_i8.hir
+++ b/tests/integration/expected/not_i8.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_3095798ff760882614d43aafa09c1c7941995bb5b9a48187009a712b0d3ac930
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 -1))
-            (let (v3 i32) (bxor v0 v2))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 -1))
+                (let (v3 i32) (bxor v0 v2))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/not_i8.masm b/tests/integration/expected/not_i8.masm
index 14672b8ca..e826722f7 100644
--- a/tests/integration/expected/not_i8.masm
+++ b/tests/integration/expected/not_i8.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_3095798ff760882614d43aafa09c1c7941995bb5b9a48187009a712b0d3ac930
 
 export.entrypoint
   push.4294967295
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_3095798ff760882614d43aafa09c1c7941995bb5b9a48187009a712b0d3ac930
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_3095798ff760882614d43aafa09c1c7941995bb5b9a48187009a712b0d3ac930::entrypoint
 end
+
diff --git a/tests/integration/expected/not_i8.wat b/tests/integration/expected/not_i8.wat
index f69f9da30..e5d125f14 100644
--- a/tests/integration/expected/not_i8.wat
+++ b/tests/integration/expected/not_i8.wat
@@ -1,4 +1,4 @@
-(module $3095798ff760882614d43aafa09c1c7941995bb5b9a48187009a712b0d3ac930.wasm
+(module $test_rust_3095798ff760882614d43aafa09c1c7941995bb5b9a48187009a712b0d3ac930.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/not_u16.hir b/tests/integration/expected/not_u16.hir
index 29da35122..f20c1096e 100644
--- a/tests/integration/expected/not_u16.hir
+++ b/tests/integration/expected/not_u16.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_de134871bf4e9b290991577707ea002a2485be8d7e8cec745b7e9faf22aff5dd
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 65535))
-            (let (v3 i32) (bxor v0 v2))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 65535))
+                (let (v3 i32) (bxor v0 v2))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/not_u16.masm b/tests/integration/expected/not_u16.masm
index c9a5cbecf..de156760d 100644
--- a/tests/integration/expected/not_u16.masm
+++ b/tests/integration/expected/not_u16.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_de134871bf4e9b290991577707ea002a2485be8d7e8cec745b7e9faf22aff5dd
 
 export.entrypoint
   push.65535
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_de134871bf4e9b290991577707ea002a2485be8d7e8cec745b7e9faf22aff5dd
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_de134871bf4e9b290991577707ea002a2485be8d7e8cec745b7e9faf22aff5dd::entrypoint
 end
+
diff --git a/tests/integration/expected/not_u16.wat b/tests/integration/expected/not_u16.wat
index 62267d340..9dbf03307 100644
--- a/tests/integration/expected/not_u16.wat
+++ b/tests/integration/expected/not_u16.wat
@@ -1,4 +1,4 @@
-(module $de134871bf4e9b290991577707ea002a2485be8d7e8cec745b7e9faf22aff5dd.wasm
+(module $test_rust_de134871bf4e9b290991577707ea002a2485be8d7e8cec745b7e9faf22aff5dd.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/not_u32.hir b/tests/integration/expected/not_u32.hir
index 344370c8b..479ec4de8 100644
--- a/tests/integration/expected/not_u32.hir
+++ b/tests/integration/expected/not_u32.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_e7047e5fc0fbd81c45f586a2e1236121815ef43b08b645ca6cfa83914a40321c
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 -1))
-            (let (v3 i32) (bxor v0 v2))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 -1))
+                (let (v3 i32) (bxor v0 v2))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/not_u32.masm b/tests/integration/expected/not_u32.masm
index 14672b8ca..3e3707721 100644
--- a/tests/integration/expected/not_u32.masm
+++ b/tests/integration/expected/not_u32.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_e7047e5fc0fbd81c45f586a2e1236121815ef43b08b645ca6cfa83914a40321c
 
 export.entrypoint
   push.4294967295
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_e7047e5fc0fbd81c45f586a2e1236121815ef43b08b645ca6cfa83914a40321c
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_e7047e5fc0fbd81c45f586a2e1236121815ef43b08b645ca6cfa83914a40321c::entrypoint
 end
+
diff --git a/tests/integration/expected/not_u32.wat b/tests/integration/expected/not_u32.wat
index 5432ce520..67dc60e88 100644
--- a/tests/integration/expected/not_u32.wat
+++ b/tests/integration/expected/not_u32.wat
@@ -1,4 +1,4 @@
-(module $e7047e5fc0fbd81c45f586a2e1236121815ef43b08b645ca6cfa83914a40321c.wasm
+(module $test_rust_e7047e5fc0fbd81c45f586a2e1236121815ef43b08b645ca6cfa83914a40321c.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/not_u8.hir b/tests/integration/expected/not_u8.hir
index a5cd9943a..1e9b1c44b 100644
--- a/tests/integration/expected/not_u8.hir
+++ b/tests/integration/expected/not_u8.hir
@@ -1,17 +1,24 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_35b25eb77e4cb9a7ed55da7b9ee04431e564770fc0ccf796f4543d6e0f9e813f
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (result i32)
-        (block 0 (param v0 i32)
-            (let (v2 i32) (const.i32 255))
-            (let (v3 i32) (bxor v0 v2))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (result i32)
+            (block 0 (param v0 i32)
+                (let (v2 i32) (const.i32 255))
+                (let (v3 i32) (bxor v0 v2))
+                (br (block 1 v3)))
+
+            (block 1 (param v1 i32)
+                (ret v1))
+        )
     )
+
 )
diff --git a/tests/integration/expected/not_u8.masm b/tests/integration/expected/not_u8.masm
index 816184375..06feed875 100644
--- a/tests/integration/expected/not_u8.masm
+++ b/tests/integration/expected/not_u8.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_35b25eb77e4cb9a7ed55da7b9ee04431e564770fc0ccf796f4543d6e0f9e813f
 
 export.entrypoint
   push.255
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_35b25eb77e4cb9a7ed55da7b9ee04431e564770fc0ccf796f4543d6e0f9e813f
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_35b25eb77e4cb9a7ed55da7b9ee04431e564770fc0ccf796f4543d6e0f9e813f::entrypoint
 end
+
diff --git a/tests/integration/expected/not_u8.wat b/tests/integration/expected/not_u8.wat
index 909f81f13..d0b3f33ce 100644
--- a/tests/integration/expected/not_u8.wat
+++ b/tests/integration/expected/not_u8.wat
@@ -1,4 +1,4 @@
-(module $35b25eb77e4cb9a7ed55da7b9ee04431e564770fc0ccf796f4543d6e0f9e813f.wasm
+(module $test_rust_35b25eb77e4cb9a7ed55da7b9ee04431e564770fc0ccf796f4543d6e0f9e813f.wasm
   (type (;0;) (func (param i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/or_bool.hir b/tests/integration/expected/or_bool.hir
index 4f10c253f..78622c160 100644
--- a/tests/integration/expected/or_bool.hir
+++ b/tests/integration/expected/or_bool.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_b27aa658e891a67a41e3a9a972e49580fe9cb8844832b2b63b81e01624e5acca
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bor v0 v1))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bor v0 v1))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/or_bool.masm b/tests/integration/expected/or_bool.masm
index 5e6d5aee9..05944fb85 100644
--- a/tests/integration/expected/or_bool.masm
+++ b/tests/integration/expected/or_bool.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_b27aa658e891a67a41e3a9a972e49580fe9cb8844832b2b63b81e01624e5acca
 
 export.entrypoint
   swap.1
   u32or
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_b27aa658e891a67a41e3a9a972e49580fe9cb8844832b2b63b81e01624e5acca
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_b27aa658e891a67a41e3a9a972e49580fe9cb8844832b2b63b81e01624e5acca::entrypoint
 end
+
diff --git a/tests/integration/expected/or_bool.wat b/tests/integration/expected/or_bool.wat
index 185c098ce..183231991 100644
--- a/tests/integration/expected/or_bool.wat
+++ b/tests/integration/expected/or_bool.wat
@@ -1,4 +1,4 @@
-(module $b27aa658e891a67a41e3a9a972e49580fe9cb8844832b2b63b81e01624e5acca.wasm
+(module $test_rust_b27aa658e891a67a41e3a9a972e49580fe9cb8844832b2b63b81e01624e5acca.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/or_i16.hir b/tests/integration/expected/or_i16.hir
index 772584cfe..477a7f726 100644
--- a/tests/integration/expected/or_i16.hir
+++ b/tests/integration/expected/or_i16.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_8c8a3ab08866a8cdf13f461d225bc40cc694eab7818133d8e81630fc58c00003
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/or_i16.masm b/tests/integration/expected/or_i16.masm
index aeec12d96..34512927e 100644
--- a/tests/integration/expected/or_i16.masm
+++ b/tests/integration/expected/or_i16.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_8c8a3ab08866a8cdf13f461d225bc40cc694eab7818133d8e81630fc58c00003
 
 export.entrypoint
   u32or
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_8c8a3ab08866a8cdf13f461d225bc40cc694eab7818133d8e81630fc58c00003
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_8c8a3ab08866a8cdf13f461d225bc40cc694eab7818133d8e81630fc58c00003::entrypoint
 end
+
diff --git a/tests/integration/expected/or_i16.wat b/tests/integration/expected/or_i16.wat
index ab1f61c26..146ea02f6 100644
--- a/tests/integration/expected/or_i16.wat
+++ b/tests/integration/expected/or_i16.wat
@@ -1,4 +1,4 @@
-(module $8c8a3ab08866a8cdf13f461d225bc40cc694eab7818133d8e81630fc58c00003.wasm
+(module $test_rust_8c8a3ab08866a8cdf13f461d225bc40cc694eab7818133d8e81630fc58c00003.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/or_i32.hir b/tests/integration/expected/or_i32.hir
index 772584cfe..59889bbb9 100644
--- a/tests/integration/expected/or_i32.hir
+++ b/tests/integration/expected/or_i32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_ffcb4feca7e38ee8605b734c387b996462f7f0070d3e33c2a53fda99a685897e
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/or_i32.masm b/tests/integration/expected/or_i32.masm
index aeec12d96..1ac343251 100644
--- a/tests/integration/expected/or_i32.masm
+++ b/tests/integration/expected/or_i32.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_ffcb4feca7e38ee8605b734c387b996462f7f0070d3e33c2a53fda99a685897e
 
 export.entrypoint
   u32or
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_ffcb4feca7e38ee8605b734c387b996462f7f0070d3e33c2a53fda99a685897e
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_ffcb4feca7e38ee8605b734c387b996462f7f0070d3e33c2a53fda99a685897e::entrypoint
 end
+
diff --git a/tests/integration/expected/or_i32.wat b/tests/integration/expected/or_i32.wat
index 1f3615178..c11fb1f20 100644
--- a/tests/integration/expected/or_i32.wat
+++ b/tests/integration/expected/or_i32.wat
@@ -1,4 +1,4 @@
-(module $ffcb4feca7e38ee8605b734c387b996462f7f0070d3e33c2a53fda99a685897e.wasm
+(module $test_rust_ffcb4feca7e38ee8605b734c387b996462f7f0070d3e33c2a53fda99a685897e.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/or_i8.hir b/tests/integration/expected/or_i8.hir
index 772584cfe..4aa2a3f98 100644
--- a/tests/integration/expected/or_i8.hir
+++ b/tests/integration/expected/or_i8.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_3c3c09a69dc74dba99e46fa37b6b592780b19270274db6be94fbda8283613174
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/or_i8.masm b/tests/integration/expected/or_i8.masm
index aeec12d96..c8a4ce1f0 100644
--- a/tests/integration/expected/or_i8.masm
+++ b/tests/integration/expected/or_i8.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_3c3c09a69dc74dba99e46fa37b6b592780b19270274db6be94fbda8283613174
 
 export.entrypoint
   u32or
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_3c3c09a69dc74dba99e46fa37b6b592780b19270274db6be94fbda8283613174
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_3c3c09a69dc74dba99e46fa37b6b592780b19270274db6be94fbda8283613174::entrypoint
 end
+
diff --git a/tests/integration/expected/or_i8.wat b/tests/integration/expected/or_i8.wat
index 178c01aa9..dfb266df6 100644
--- a/tests/integration/expected/or_i8.wat
+++ b/tests/integration/expected/or_i8.wat
@@ -1,4 +1,4 @@
-(module $3c3c09a69dc74dba99e46fa37b6b592780b19270274db6be94fbda8283613174.wasm
+(module $test_rust_3c3c09a69dc74dba99e46fa37b6b592780b19270274db6be94fbda8283613174.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/or_u16.hir b/tests/integration/expected/or_u16.hir
index 772584cfe..f3312aa3d 100644
--- a/tests/integration/expected/or_u16.hir
+++ b/tests/integration/expected/or_u16.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_10d8c002ebbe90dc0a59554ee1570001dc61801e8d9f0ddf8b981a086284c00d
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/or_u16.masm b/tests/integration/expected/or_u16.masm
index aeec12d96..ae1a7d1d4 100644
--- a/tests/integration/expected/or_u16.masm
+++ b/tests/integration/expected/or_u16.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_10d8c002ebbe90dc0a59554ee1570001dc61801e8d9f0ddf8b981a086284c00d
 
 export.entrypoint
   u32or
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_10d8c002ebbe90dc0a59554ee1570001dc61801e8d9f0ddf8b981a086284c00d
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_10d8c002ebbe90dc0a59554ee1570001dc61801e8d9f0ddf8b981a086284c00d::entrypoint
 end
+
diff --git a/tests/integration/expected/or_u16.wat b/tests/integration/expected/or_u16.wat
index c96b6f327..f4d9034ec 100644
--- a/tests/integration/expected/or_u16.wat
+++ b/tests/integration/expected/or_u16.wat
@@ -1,4 +1,4 @@
-(module $10d8c002ebbe90dc0a59554ee1570001dc61801e8d9f0ddf8b981a086284c00d.wasm
+(module $test_rust_10d8c002ebbe90dc0a59554ee1570001dc61801e8d9f0ddf8b981a086284c00d.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/or_u32.hir b/tests/integration/expected/or_u32.hir
index 772584cfe..655dcf835 100644
--- a/tests/integration/expected/or_u32.hir
+++ b/tests/integration/expected/or_u32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_051fe51f50265dba6f2bf7289cceb8e7ed3693a0fa020cc6c2202f54677db6b4
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/or_u32.masm b/tests/integration/expected/or_u32.masm
index aeec12d96..4e23ca45c 100644
--- a/tests/integration/expected/or_u32.masm
+++ b/tests/integration/expected/or_u32.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_051fe51f50265dba6f2bf7289cceb8e7ed3693a0fa020cc6c2202f54677db6b4
 
 export.entrypoint
   u32or
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_051fe51f50265dba6f2bf7289cceb8e7ed3693a0fa020cc6c2202f54677db6b4
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_051fe51f50265dba6f2bf7289cceb8e7ed3693a0fa020cc6c2202f54677db6b4::entrypoint
 end
+
diff --git a/tests/integration/expected/or_u32.wat b/tests/integration/expected/or_u32.wat
index 99394a7e3..e5917ca07 100644
--- a/tests/integration/expected/or_u32.wat
+++ b/tests/integration/expected/or_u32.wat
@@ -1,4 +1,4 @@
-(module $051fe51f50265dba6f2bf7289cceb8e7ed3693a0fa020cc6c2202f54677db6b4.wasm
+(module $test_rust_051fe51f50265dba6f2bf7289cceb8e7ed3693a0fa020cc6c2202f54677db6b4.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/or_u8.hir b/tests/integration/expected/or_u8.hir
index 772584cfe..8a1dd3345 100644
--- a/tests/integration/expected/or_u8.hir
+++ b/tests/integration/expected/or_u8.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_0e3d57c8c71f555a8cdba009047c4bf2655b2539ddd5bc24847e650a14566381
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/or_u8.masm b/tests/integration/expected/or_u8.masm
index aeec12d96..3b4f39a4b 100644
--- a/tests/integration/expected/or_u8.masm
+++ b/tests/integration/expected/or_u8.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_0e3d57c8c71f555a8cdba009047c4bf2655b2539ddd5bc24847e650a14566381
 
 export.entrypoint
   u32or
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_0e3d57c8c71f555a8cdba009047c4bf2655b2539ddd5bc24847e650a14566381
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_0e3d57c8c71f555a8cdba009047c4bf2655b2539ddd5bc24847e650a14566381::entrypoint
 end
+
diff --git a/tests/integration/expected/or_u8.wat b/tests/integration/expected/or_u8.wat
index b937c926a..1807b5c1e 100644
--- a/tests/integration/expected/or_u8.wat
+++ b/tests/integration/expected/or_u8.wat
@@ -1,4 +1,4 @@
-(module $0e3d57c8c71f555a8cdba009047c4bf2655b2539ddd5bc24847e650a14566381.wasm
+(module $test_rust_0e3d57c8c71f555a8cdba009047c4bf2655b2539ddd5bc24847e650a14566381.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/shl_i16.hir b/tests/integration/expected/shl_i16.hir
index 15894768c..4c62a550a 100644
--- a/tests/integration/expected/shl_i16.hir
+++ b/tests/integration/expected/shl_i16.hir
@@ -1,18 +1,25 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_0321dd193a3848fd9694d83145f19dfd509077216649a5c8574ca9ef1fad1279
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (const.i32 15))
-            (let (v4 i32) (band v1 v3))
-            (let (v5 i32) (shl.wrapping v0 v4))
-            (ret v5))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (const.i32 15))
+                (let (v4 i32) (band v1 v3))
+                (let (v5 i32) (shl.wrapping v0 v4))
+                (br (block 1 v5)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/shl_i16.masm b/tests/integration/expected/shl_i16.masm
index 039722ffc..f1d7c98a1 100644
--- a/tests/integration/expected/shl_i16.masm
+++ b/tests/integration/expected/shl_i16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_0321dd193a3848fd9694d83145f19dfd509077216649a5c8574ca9ef1fad1279
 
 export.entrypoint
   push.15
@@ -663,10 +8,11 @@ export.entrypoint
   u32shl
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_0321dd193a3848fd9694d83145f19dfd509077216649a5c8574ca9ef1fad1279
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_0321dd193a3848fd9694d83145f19dfd509077216649a5c8574ca9ef1fad1279::entrypoint
 end
+
diff --git a/tests/integration/expected/shl_i16.wat b/tests/integration/expected/shl_i16.wat
index e01453b46..80991a03f 100644
--- a/tests/integration/expected/shl_i16.wat
+++ b/tests/integration/expected/shl_i16.wat
@@ -1,4 +1,4 @@
-(module $0321dd193a3848fd9694d83145f19dfd509077216649a5c8574ca9ef1fad1279.wasm
+(module $test_rust_0321dd193a3848fd9694d83145f19dfd509077216649a5c8574ca9ef1fad1279.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/shl_i32.hir b/tests/integration/expected/shl_i32.hir
index 967cd222d..e83c12f18 100644
--- a/tests/integration/expected/shl_i32.hir
+++ b/tests/integration/expected/shl_i32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_77347ac38c4f68c555c0f6c6fd4af8c580cac21fd98baf7c8bd8e0249991b718
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (shl.wrapping v0 v1))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (shl.wrapping v0 v1))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/shl_i32.masm b/tests/integration/expected/shl_i32.masm
index dd856d9ac..903c4e84c 100644
--- a/tests/integration/expected/shl_i32.masm
+++ b/tests/integration/expected/shl_i32.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_77347ac38c4f68c555c0f6c6fd4af8c580cac21fd98baf7c8bd8e0249991b718
 
 export.entrypoint
   swap.1
   u32shl
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_77347ac38c4f68c555c0f6c6fd4af8c580cac21fd98baf7c8bd8e0249991b718
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_77347ac38c4f68c555c0f6c6fd4af8c580cac21fd98baf7c8bd8e0249991b718::entrypoint
 end
+
diff --git a/tests/integration/expected/shl_i32.wat b/tests/integration/expected/shl_i32.wat
index a543bba64..a2228e3dd 100644
--- a/tests/integration/expected/shl_i32.wat
+++ b/tests/integration/expected/shl_i32.wat
@@ -1,4 +1,4 @@
-(module $77347ac38c4f68c555c0f6c6fd4af8c580cac21fd98baf7c8bd8e0249991b718.wasm
+(module $test_rust_77347ac38c4f68c555c0f6c6fd4af8c580cac21fd98baf7c8bd8e0249991b718.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/shl_i8.hir b/tests/integration/expected/shl_i8.hir
index 483793220..870bc5296 100644
--- a/tests/integration/expected/shl_i8.hir
+++ b/tests/integration/expected/shl_i8.hir
@@ -1,18 +1,25 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_5c39989232aaeaed99257c5c5dd56de3164cb62fe893b1c4752946d9a8035626
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (const.i32 7))
-            (let (v4 i32) (band v1 v3))
-            (let (v5 i32) (shl.wrapping v0 v4))
-            (ret v5))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (const.i32 7))
+                (let (v4 i32) (band v1 v3))
+                (let (v5 i32) (shl.wrapping v0 v4))
+                (br (block 1 v5)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/shl_i8.masm b/tests/integration/expected/shl_i8.masm
index 0ac88398a..26436942b 100644
--- a/tests/integration/expected/shl_i8.masm
+++ b/tests/integration/expected/shl_i8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_5c39989232aaeaed99257c5c5dd56de3164cb62fe893b1c4752946d9a8035626
 
 export.entrypoint
   push.7
@@ -663,10 +8,11 @@ export.entrypoint
   u32shl
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_5c39989232aaeaed99257c5c5dd56de3164cb62fe893b1c4752946d9a8035626
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_5c39989232aaeaed99257c5c5dd56de3164cb62fe893b1c4752946d9a8035626::entrypoint
 end
+
diff --git a/tests/integration/expected/shl_i8.wat b/tests/integration/expected/shl_i8.wat
index f5487a6b3..2f213c25c 100644
--- a/tests/integration/expected/shl_i8.wat
+++ b/tests/integration/expected/shl_i8.wat
@@ -1,4 +1,4 @@
-(module $5c39989232aaeaed99257c5c5dd56de3164cb62fe893b1c4752946d9a8035626.wasm
+(module $test_rust_5c39989232aaeaed99257c5c5dd56de3164cb62fe893b1c4752946d9a8035626.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/shl_u16.hir b/tests/integration/expected/shl_u16.hir
index 2ca4a334d..26168a498 100644
--- a/tests/integration/expected/shl_u16.hir
+++ b/tests/integration/expected/shl_u16.hir
@@ -1,20 +1,27 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_12e1569e41153e52fb7cb3781dcfca47ee0548f6160a9e8e38b7734ffd45cb7e
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (const.i32 15))
-            (let (v4 i32) (band v1 v3))
-            (let (v5 i32) (shl.wrapping v0 v4))
-            (let (v6 i32) (const.i32 65535))
-            (let (v7 i32) (band v5 v6))
-            (ret v7))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (const.i32 15))
+                (let (v4 i32) (band v1 v3))
+                (let (v5 i32) (shl.wrapping v0 v4))
+                (let (v6 i32) (const.i32 65535))
+                (let (v7 i32) (band v5 v6))
+                (br (block 1 v7)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/shl_u16.masm b/tests/integration/expected/shl_u16.masm
index 912a024f2..c50001b8a 100644
--- a/tests/integration/expected/shl_u16.masm
+++ b/tests/integration/expected/shl_u16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_12e1569e41153e52fb7cb3781dcfca47ee0548f6160a9e8e38b7734ffd45cb7e
 
 export.entrypoint
   push.15
@@ -665,10 +10,11 @@ export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_12e1569e41153e52fb7cb3781dcfca47ee0548f6160a9e8e38b7734ffd45cb7e
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_12e1569e41153e52fb7cb3781dcfca47ee0548f6160a9e8e38b7734ffd45cb7e::entrypoint
 end
+
diff --git a/tests/integration/expected/shl_u16.wat b/tests/integration/expected/shl_u16.wat
index c3996dfec..f0de324ed 100644
--- a/tests/integration/expected/shl_u16.wat
+++ b/tests/integration/expected/shl_u16.wat
@@ -1,4 +1,4 @@
-(module $12e1569e41153e52fb7cb3781dcfca47ee0548f6160a9e8e38b7734ffd45cb7e.wasm
+(module $test_rust_12e1569e41153e52fb7cb3781dcfca47ee0548f6160a9e8e38b7734ffd45cb7e.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/shl_u32.hir b/tests/integration/expected/shl_u32.hir
index 967cd222d..b078d0141 100644
--- a/tests/integration/expected/shl_u32.hir
+++ b/tests/integration/expected/shl_u32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_c3626bb8d040702290734d36fd1995f9bd099bbd60fea362c6a50e3386dab95b
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (shl.wrapping v0 v1))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (shl.wrapping v0 v1))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/shl_u32.masm b/tests/integration/expected/shl_u32.masm
index dd856d9ac..b0a4db090 100644
--- a/tests/integration/expected/shl_u32.masm
+++ b/tests/integration/expected/shl_u32.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_c3626bb8d040702290734d36fd1995f9bd099bbd60fea362c6a50e3386dab95b
 
 export.entrypoint
   swap.1
   u32shl
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_c3626bb8d040702290734d36fd1995f9bd099bbd60fea362c6a50e3386dab95b
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_c3626bb8d040702290734d36fd1995f9bd099bbd60fea362c6a50e3386dab95b::entrypoint
 end
+
diff --git a/tests/integration/expected/shl_u32.wat b/tests/integration/expected/shl_u32.wat
index 64a7df405..74358d45a 100644
--- a/tests/integration/expected/shl_u32.wat
+++ b/tests/integration/expected/shl_u32.wat
@@ -1,4 +1,4 @@
-(module $c3626bb8d040702290734d36fd1995f9bd099bbd60fea362c6a50e3386dab95b.wasm
+(module $test_rust_c3626bb8d040702290734d36fd1995f9bd099bbd60fea362c6a50e3386dab95b.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/shl_u8.hir b/tests/integration/expected/shl_u8.hir
index 7699cd41f..af3343a8c 100644
--- a/tests/integration/expected/shl_u8.hir
+++ b/tests/integration/expected/shl_u8.hir
@@ -1,20 +1,27 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_11ed47f38055f9bb6c854e44680e18c81be5e7220524472414d55982c663892d
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (const.i32 7))
-            (let (v4 i32) (band v1 v3))
-            (let (v5 i32) (shl.wrapping v0 v4))
-            (let (v6 i32) (const.i32 255))
-            (let (v7 i32) (band v5 v6))
-            (ret v7))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (const.i32 7))
+                (let (v4 i32) (band v1 v3))
+                (let (v5 i32) (shl.wrapping v0 v4))
+                (let (v6 i32) (const.i32 255))
+                (let (v7 i32) (band v5 v6))
+                (br (block 1 v7)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/shl_u8.masm b/tests/integration/expected/shl_u8.masm
index 715d172eb..7aff95a6f 100644
--- a/tests/integration/expected/shl_u8.masm
+++ b/tests/integration/expected/shl_u8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_11ed47f38055f9bb6c854e44680e18c81be5e7220524472414d55982c663892d
 
 export.entrypoint
   push.7
@@ -665,10 +10,11 @@ export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_11ed47f38055f9bb6c854e44680e18c81be5e7220524472414d55982c663892d
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_11ed47f38055f9bb6c854e44680e18c81be5e7220524472414d55982c663892d::entrypoint
 end
+
diff --git a/tests/integration/expected/shl_u8.wat b/tests/integration/expected/shl_u8.wat
index 59a4149ce..6c862d574 100644
--- a/tests/integration/expected/shl_u8.wat
+++ b/tests/integration/expected/shl_u8.wat
@@ -1,4 +1,4 @@
-(module $11ed47f38055f9bb6c854e44680e18c81be5e7220524472414d55982c663892d.wasm
+(module $test_rust_11ed47f38055f9bb6c854e44680e18c81be5e7220524472414d55982c663892d.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/shr_u16.hir b/tests/integration/expected/shr_u16.hir
index 22a4cbb05..7c4c05375 100644
--- a/tests/integration/expected/shr_u16.hir
+++ b/tests/integration/expected/shr_u16.hir
@@ -1,21 +1,28 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_0b3b019a1f9ca0666eeeeff0b69793030831994482d8a03491ea3289d29dd83b
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (const.i32 15))
-            (let (v4 i32) (band v1 v3))
-            (let (v5 u32) (cast v0))
-            (let (v6 u32) (cast v4))
-            (let (v7 u32) (shr.wrapping v5 v6))
-            (let (v8 i32) (cast v7))
-            (ret v8))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (const.i32 15))
+                (let (v4 i32) (band v1 v3))
+                (let (v5 u32) (cast v0))
+                (let (v6 u32) (cast v4))
+                (let (v7 u32) (shr.wrapping v5 v6))
+                (let (v8 i32) (cast v7))
+                (br (block 1 v8)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/shr_u16.masm b/tests/integration/expected/shr_u16.masm
index 1986942f3..11b08d663 100644
--- a/tests/integration/expected/shr_u16.masm
+++ b/tests/integration/expected/shr_u16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_0b3b019a1f9ca0666eeeeff0b69793030831994482d8a03491ea3289d29dd83b
 
 export.entrypoint
   dup.0
@@ -678,10 +23,11 @@ export.entrypoint
   assertz
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_0b3b019a1f9ca0666eeeeff0b69793030831994482d8a03491ea3289d29dd83b
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_0b3b019a1f9ca0666eeeeff0b69793030831994482d8a03491ea3289d29dd83b::entrypoint
 end
+
diff --git a/tests/integration/expected/shr_u16.wat b/tests/integration/expected/shr_u16.wat
index dd2b48cb6..058375c0f 100644
--- a/tests/integration/expected/shr_u16.wat
+++ b/tests/integration/expected/shr_u16.wat
@@ -1,4 +1,4 @@
-(module $0b3b019a1f9ca0666eeeeff0b69793030831994482d8a03491ea3289d29dd83b.wasm
+(module $test_rust_0b3b019a1f9ca0666eeeeff0b69793030831994482d8a03491ea3289d29dd83b.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/shr_u8.hir b/tests/integration/expected/shr_u8.hir
index d9a5e4d9c..42318ce80 100644
--- a/tests/integration/expected/shr_u8.hir
+++ b/tests/integration/expected/shr_u8.hir
@@ -1,21 +1,28 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_0c960295b036bf3739ebef1e3e9ee68b7d941715927c576e8625d987a31dbbfe
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (const.i32 7))
-            (let (v4 i32) (band v1 v3))
-            (let (v5 u32) (cast v0))
-            (let (v6 u32) (cast v4))
-            (let (v7 u32) (shr.wrapping v5 v6))
-            (let (v8 i32) (cast v7))
-            (ret v8))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (const.i32 7))
+                (let (v4 i32) (band v1 v3))
+                (let (v5 u32) (cast v0))
+                (let (v6 u32) (cast v4))
+                (let (v7 u32) (shr.wrapping v5 v6))
+                (let (v8 i32) (cast v7))
+                (br (block 1 v8)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/shr_u8.masm b/tests/integration/expected/shr_u8.masm
index 1ca6e8b39..d9595b21e 100644
--- a/tests/integration/expected/shr_u8.masm
+++ b/tests/integration/expected/shr_u8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_0c960295b036bf3739ebef1e3e9ee68b7d941715927c576e8625d987a31dbbfe
 
 export.entrypoint
   dup.0
@@ -678,10 +23,11 @@ export.entrypoint
   assertz
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_0c960295b036bf3739ebef1e3e9ee68b7d941715927c576e8625d987a31dbbfe
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_0c960295b036bf3739ebef1e3e9ee68b7d941715927c576e8625d987a31dbbfe::entrypoint
 end
+
diff --git a/tests/integration/expected/shr_u8.wat b/tests/integration/expected/shr_u8.wat
index f48954a80..352650099 100644
--- a/tests/integration/expected/shr_u8.wat
+++ b/tests/integration/expected/shr_u8.wat
@@ -1,4 +1,4 @@
-(module $0c960295b036bf3739ebef1e3e9ee68b7d941715927c576e8625d987a31dbbfe.wasm
+(module $test_rust_0c960295b036bf3739ebef1e3e9ee68b7d941715927c576e8625d987a31dbbfe.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/sub_i16.hir b/tests/integration/expected/sub_i16.hir
index 005f6b299..51ee3f620 100644
--- a/tests/integration/expected/sub_i16.hir
+++ b/tests/integration/expected/sub_i16.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_0bd9d85b7ff8d3866d324cd6d4ca05c25e67a2304dcd772858e426a99ba6ac7a
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (sub.wrapping v0 v1))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (sub.wrapping v0 v1))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/sub_i16.masm b/tests/integration/expected/sub_i16.masm
index bcdcaff6a..dd110f8cf 100644
--- a/tests/integration/expected/sub_i16.masm
+++ b/tests/integration/expected/sub_i16.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_0bd9d85b7ff8d3866d324cd6d4ca05c25e67a2304dcd772858e426a99ba6ac7a
 
 export.entrypoint
   swap.1
   u32wrapping_sub
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_0bd9d85b7ff8d3866d324cd6d4ca05c25e67a2304dcd772858e426a99ba6ac7a
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_0bd9d85b7ff8d3866d324cd6d4ca05c25e67a2304dcd772858e426a99ba6ac7a::entrypoint
 end
+
diff --git a/tests/integration/expected/sub_i16.wat b/tests/integration/expected/sub_i16.wat
index 36b9c6b6f..cbfb9ec5d 100644
--- a/tests/integration/expected/sub_i16.wat
+++ b/tests/integration/expected/sub_i16.wat
@@ -1,4 +1,4 @@
-(module $0bd9d85b7ff8d3866d324cd6d4ca05c25e67a2304dcd772858e426a99ba6ac7a.wasm
+(module $test_rust_0bd9d85b7ff8d3866d324cd6d4ca05c25e67a2304dcd772858e426a99ba6ac7a.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/sub_i32.hir b/tests/integration/expected/sub_i32.hir
index 005f6b299..fa26294c7 100644
--- a/tests/integration/expected/sub_i32.hir
+++ b/tests/integration/expected/sub_i32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_6c95bc4ac3c970051b695c8b0d81ce4e464588966d9047a4db06a19a2885319c
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (sub.wrapping v0 v1))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (sub.wrapping v0 v1))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/sub_i32.masm b/tests/integration/expected/sub_i32.masm
index bcdcaff6a..c29ff2289 100644
--- a/tests/integration/expected/sub_i32.masm
+++ b/tests/integration/expected/sub_i32.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_6c95bc4ac3c970051b695c8b0d81ce4e464588966d9047a4db06a19a2885319c
 
 export.entrypoint
   swap.1
   u32wrapping_sub
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_6c95bc4ac3c970051b695c8b0d81ce4e464588966d9047a4db06a19a2885319c
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_6c95bc4ac3c970051b695c8b0d81ce4e464588966d9047a4db06a19a2885319c::entrypoint
 end
+
diff --git a/tests/integration/expected/sub_i32.wat b/tests/integration/expected/sub_i32.wat
index 905f3b55b..de0c44405 100644
--- a/tests/integration/expected/sub_i32.wat
+++ b/tests/integration/expected/sub_i32.wat
@@ -1,4 +1,4 @@
-(module $6c95bc4ac3c970051b695c8b0d81ce4e464588966d9047a4db06a19a2885319c.wasm
+(module $test_rust_6c95bc4ac3c970051b695c8b0d81ce4e464588966d9047a4db06a19a2885319c.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/sub_i8.hir b/tests/integration/expected/sub_i8.hir
index 005f6b299..726e47287 100644
--- a/tests/integration/expected/sub_i8.hir
+++ b/tests/integration/expected/sub_i8.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_47672a27266673dae49801c73b4791b5dd218b4cbca4677e7e9390d3988f3484
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (sub.wrapping v0 v1))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (sub.wrapping v0 v1))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/sub_i8.masm b/tests/integration/expected/sub_i8.masm
index bcdcaff6a..71df6c601 100644
--- a/tests/integration/expected/sub_i8.masm
+++ b/tests/integration/expected/sub_i8.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_47672a27266673dae49801c73b4791b5dd218b4cbca4677e7e9390d3988f3484
 
 export.entrypoint
   swap.1
   u32wrapping_sub
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_47672a27266673dae49801c73b4791b5dd218b4cbca4677e7e9390d3988f3484
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_47672a27266673dae49801c73b4791b5dd218b4cbca4677e7e9390d3988f3484::entrypoint
 end
+
diff --git a/tests/integration/expected/sub_i8.wat b/tests/integration/expected/sub_i8.wat
index 66728f2a1..6b202ca9d 100644
--- a/tests/integration/expected/sub_i8.wat
+++ b/tests/integration/expected/sub_i8.wat
@@ -1,4 +1,4 @@
-(module $47672a27266673dae49801c73b4791b5dd218b4cbca4677e7e9390d3988f3484.wasm
+(module $test_rust_47672a27266673dae49801c73b4791b5dd218b4cbca4677e7e9390d3988f3484.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/sub_u16.hir b/tests/integration/expected/sub_u16.hir
index 0a1b61b6f..b3f7694d5 100644
--- a/tests/integration/expected/sub_u16.hir
+++ b/tests/integration/expected/sub_u16.hir
@@ -1,18 +1,25 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_c0e8cc698fc282804a294a7ee5f65d91b6c6b89556c58494b84b1b928da26ac7
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (sub.wrapping v0 v1))
-            (let (v4 i32) (const.i32 65535))
-            (let (v5 i32) (band v3 v4))
-            (ret v5))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (sub.wrapping v0 v1))
+                (let (v4 i32) (const.i32 65535))
+                (let (v5 i32) (band v3 v4))
+                (br (block 1 v5)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/sub_u16.masm b/tests/integration/expected/sub_u16.masm
index 4b544a53e..f8fdf54e5 100644
--- a/tests/integration/expected/sub_u16.masm
+++ b/tests/integration/expected/sub_u16.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_c0e8cc698fc282804a294a7ee5f65d91b6c6b89556c58494b84b1b928da26ac7
 
 export.entrypoint
   swap.1
@@ -662,10 +7,11 @@ export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_c0e8cc698fc282804a294a7ee5f65d91b6c6b89556c58494b84b1b928da26ac7
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_c0e8cc698fc282804a294a7ee5f65d91b6c6b89556c58494b84b1b928da26ac7::entrypoint
 end
+
diff --git a/tests/integration/expected/sub_u16.wat b/tests/integration/expected/sub_u16.wat
index 61e3e6168..964f5b079 100644
--- a/tests/integration/expected/sub_u16.wat
+++ b/tests/integration/expected/sub_u16.wat
@@ -1,4 +1,4 @@
-(module $c0e8cc698fc282804a294a7ee5f65d91b6c6b89556c58494b84b1b928da26ac7.wasm
+(module $test_rust_c0e8cc698fc282804a294a7ee5f65d91b6c6b89556c58494b84b1b928da26ac7.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/sub_u32.hir b/tests/integration/expected/sub_u32.hir
index 005f6b299..03e553c4d 100644
--- a/tests/integration/expected/sub_u32.hir
+++ b/tests/integration/expected/sub_u32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_caa1ad606ef14599034dee42dfda3f3b0e116720e1d8e83f024cc9fd2113e4b0
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (sub.wrapping v0 v1))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (sub.wrapping v0 v1))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/sub_u32.masm b/tests/integration/expected/sub_u32.masm
index bcdcaff6a..f17377852 100644
--- a/tests/integration/expected/sub_u32.masm
+++ b/tests/integration/expected/sub_u32.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_caa1ad606ef14599034dee42dfda3f3b0e116720e1d8e83f024cc9fd2113e4b0
 
 export.entrypoint
   swap.1
   u32wrapping_sub
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_caa1ad606ef14599034dee42dfda3f3b0e116720e1d8e83f024cc9fd2113e4b0
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_caa1ad606ef14599034dee42dfda3f3b0e116720e1d8e83f024cc9fd2113e4b0::entrypoint
 end
+
diff --git a/tests/integration/expected/sub_u32.wat b/tests/integration/expected/sub_u32.wat
index 3fb3e1df6..c619c7fb0 100644
--- a/tests/integration/expected/sub_u32.wat
+++ b/tests/integration/expected/sub_u32.wat
@@ -1,4 +1,4 @@
-(module $caa1ad606ef14599034dee42dfda3f3b0e116720e1d8e83f024cc9fd2113e4b0.wasm
+(module $test_rust_caa1ad606ef14599034dee42dfda3f3b0e116720e1d8e83f024cc9fd2113e4b0.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/sub_u8.hir b/tests/integration/expected/sub_u8.hir
index 973f78ec3..92e32b089 100644
--- a/tests/integration/expected/sub_u8.hir
+++ b/tests/integration/expected/sub_u8.hir
@@ -1,18 +1,25 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_199edd7a9771d7f0d34a9bbc05730a9c8345e263f0285d6a3d4f49a010be4661
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (sub.wrapping v0 v1))
-            (let (v4 i32) (const.i32 255))
-            (let (v5 i32) (band v3 v4))
-            (ret v5))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (sub.wrapping v0 v1))
+                (let (v4 i32) (const.i32 255))
+                (let (v5 i32) (band v3 v4))
+                (br (block 1 v5)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/sub_u8.masm b/tests/integration/expected/sub_u8.masm
index c3a528d85..32c4c8092 100644
--- a/tests/integration/expected/sub_u8.masm
+++ b/tests/integration/expected/sub_u8.masm
@@ -1,659 +1,4 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_199edd7a9771d7f0d34a9bbc05730a9c8345e263f0285d6a3d4f49a010be4661
 
 export.entrypoint
   swap.1
@@ -662,10 +7,11 @@ export.entrypoint
   u32and
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_199edd7a9771d7f0d34a9bbc05730a9c8345e263f0285d6a3d4f49a010be4661
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_199edd7a9771d7f0d34a9bbc05730a9c8345e263f0285d6a3d4f49a010be4661::entrypoint
 end
+
diff --git a/tests/integration/expected/sub_u8.wat b/tests/integration/expected/sub_u8.wat
index a9434e059..5230bd649 100644
--- a/tests/integration/expected/sub_u8.wat
+++ b/tests/integration/expected/sub_u8.wat
@@ -1,4 +1,4 @@
-(module $199edd7a9771d7f0d34a9bbc05730a9c8345e263f0285d6a3d4f49a010be4661.wasm
+(module $test_rust_199edd7a9771d7f0d34a9bbc05730a9c8345e263f0285d6a3d4f49a010be4661.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/xor_bool.hir b/tests/integration/expected/xor_bool.hir
index 809a19267..5e5e60434 100644
--- a/tests/integration/expected/xor_bool.hir
+++ b/tests/integration/expected/xor_bool.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_dcd67ec43bbcd9107cffbbb7423564fd0a2cb122c842d7b8f810e5d557615869
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bxor v0 v1))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bxor v0 v1))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/xor_bool.masm b/tests/integration/expected/xor_bool.masm
index 5b3d6fddc..459584639 100644
--- a/tests/integration/expected/xor_bool.masm
+++ b/tests/integration/expected/xor_bool.masm
@@ -1,669 +1,15 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_dcd67ec43bbcd9107cffbbb7423564fd0a2cb122c842d7b8f810e5d557615869
 
 export.entrypoint
   swap.1
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_dcd67ec43bbcd9107cffbbb7423564fd0a2cb122c842d7b8f810e5d557615869
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_dcd67ec43bbcd9107cffbbb7423564fd0a2cb122c842d7b8f810e5d557615869::entrypoint
 end
+
diff --git a/tests/integration/expected/xor_bool.wat b/tests/integration/expected/xor_bool.wat
index e80aed8b4..0d8359659 100644
--- a/tests/integration/expected/xor_bool.wat
+++ b/tests/integration/expected/xor_bool.wat
@@ -1,4 +1,4 @@
-(module $dcd67ec43bbcd9107cffbbb7423564fd0a2cb122c842d7b8f810e5d557615869.wasm
+(module $test_rust_dcd67ec43bbcd9107cffbbb7423564fd0a2cb122c842d7b8f810e5d557615869.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 0
diff --git a/tests/integration/expected/xor_i16.hir b/tests/integration/expected/xor_i16.hir
index 55a88539b..f4340641d 100644
--- a/tests/integration/expected/xor_i16.hir
+++ b/tests/integration/expected/xor_i16.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_31340dea94d5815fdbeada64122d75ef52c31ef664b9bdb97f25dc50403c962e
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bxor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bxor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/xor_i16.masm b/tests/integration/expected/xor_i16.masm
index fc4c6360e..f8960817a 100644
--- a/tests/integration/expected/xor_i16.masm
+++ b/tests/integration/expected/xor_i16.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_31340dea94d5815fdbeada64122d75ef52c31ef664b9bdb97f25dc50403c962e
 
 export.entrypoint
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_31340dea94d5815fdbeada64122d75ef52c31ef664b9bdb97f25dc50403c962e
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_31340dea94d5815fdbeada64122d75ef52c31ef664b9bdb97f25dc50403c962e::entrypoint
 end
+
diff --git a/tests/integration/expected/xor_i16.wat b/tests/integration/expected/xor_i16.wat
index 1264231ea..8ea701c80 100644
--- a/tests/integration/expected/xor_i16.wat
+++ b/tests/integration/expected/xor_i16.wat
@@ -1,4 +1,4 @@
-(module $31340dea94d5815fdbeada64122d75ef52c31ef664b9bdb97f25dc50403c962e.wasm
+(module $test_rust_31340dea94d5815fdbeada64122d75ef52c31ef664b9bdb97f25dc50403c962e.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/xor_i32.hir b/tests/integration/expected/xor_i32.hir
index 55a88539b..175a66831 100644
--- a/tests/integration/expected/xor_i32.hir
+++ b/tests/integration/expected/xor_i32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_595d33f8d41bf8d0b48b19b9d0d717b2001169c6dacb943b6933b7ac892d670e
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bxor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bxor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/xor_i32.masm b/tests/integration/expected/xor_i32.masm
index fc4c6360e..eeed553d9 100644
--- a/tests/integration/expected/xor_i32.masm
+++ b/tests/integration/expected/xor_i32.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_595d33f8d41bf8d0b48b19b9d0d717b2001169c6dacb943b6933b7ac892d670e
 
 export.entrypoint
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_595d33f8d41bf8d0b48b19b9d0d717b2001169c6dacb943b6933b7ac892d670e
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_595d33f8d41bf8d0b48b19b9d0d717b2001169c6dacb943b6933b7ac892d670e::entrypoint
 end
+
diff --git a/tests/integration/expected/xor_i32.wat b/tests/integration/expected/xor_i32.wat
index 4f29b6184..803c58587 100644
--- a/tests/integration/expected/xor_i32.wat
+++ b/tests/integration/expected/xor_i32.wat
@@ -1,4 +1,4 @@
-(module $595d33f8d41bf8d0b48b19b9d0d717b2001169c6dacb943b6933b7ac892d670e.wasm
+(module $test_rust_595d33f8d41bf8d0b48b19b9d0d717b2001169c6dacb943b6933b7ac892d670e.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/xor_i8.hir b/tests/integration/expected/xor_i8.hir
index 55a88539b..7c1cbeba0 100644
--- a/tests/integration/expected/xor_i8.hir
+++ b/tests/integration/expected/xor_i8.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_c64e2a982ef5596c6379542467e047153ae5c1824246ef4cbe06b327d51be74a
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bxor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bxor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/xor_i8.masm b/tests/integration/expected/xor_i8.masm
index fc4c6360e..3ed3248c7 100644
--- a/tests/integration/expected/xor_i8.masm
+++ b/tests/integration/expected/xor_i8.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_c64e2a982ef5596c6379542467e047153ae5c1824246ef4cbe06b327d51be74a
 
 export.entrypoint
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_c64e2a982ef5596c6379542467e047153ae5c1824246ef4cbe06b327d51be74a
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_c64e2a982ef5596c6379542467e047153ae5c1824246ef4cbe06b327d51be74a::entrypoint
 end
+
diff --git a/tests/integration/expected/xor_i8.wat b/tests/integration/expected/xor_i8.wat
index c5790b709..edd4bcf67 100644
--- a/tests/integration/expected/xor_i8.wat
+++ b/tests/integration/expected/xor_i8.wat
@@ -1,4 +1,4 @@
-(module $c64e2a982ef5596c6379542467e047153ae5c1824246ef4cbe06b327d51be74a.wasm
+(module $test_rust_c64e2a982ef5596c6379542467e047153ae5c1824246ef4cbe06b327d51be74a.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/xor_u16.hir b/tests/integration/expected/xor_u16.hir
index 55a88539b..7764be0da 100644
--- a/tests/integration/expected/xor_u16.hir
+++ b/tests/integration/expected/xor_u16.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_edfc84a713511234ff9afc4c89c4fd998413355e149a7e331eaec655163d9afe
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bxor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bxor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/xor_u16.masm b/tests/integration/expected/xor_u16.masm
index fc4c6360e..fb5b9d7e8 100644
--- a/tests/integration/expected/xor_u16.masm
+++ b/tests/integration/expected/xor_u16.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_edfc84a713511234ff9afc4c89c4fd998413355e149a7e331eaec655163d9afe
 
 export.entrypoint
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_edfc84a713511234ff9afc4c89c4fd998413355e149a7e331eaec655163d9afe
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_edfc84a713511234ff9afc4c89c4fd998413355e149a7e331eaec655163d9afe::entrypoint
 end
+
diff --git a/tests/integration/expected/xor_u16.wat b/tests/integration/expected/xor_u16.wat
index 8752de254..563b1744e 100644
--- a/tests/integration/expected/xor_u16.wat
+++ b/tests/integration/expected/xor_u16.wat
@@ -1,4 +1,4 @@
-(module $edfc84a713511234ff9afc4c89c4fd998413355e149a7e331eaec655163d9afe.wasm
+(module $test_rust_edfc84a713511234ff9afc4c89c4fd998413355e149a7e331eaec655163d9afe.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/xor_u32.hir b/tests/integration/expected/xor_u32.hir
index 55a88539b..4e456ce2d 100644
--- a/tests/integration/expected/xor_u32.hir
+++ b/tests/integration/expected/xor_u32.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_972d35b4c4e5a4bf3450bff55d3407152f81ce2206ea8e96de43f1800f0f5f59
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bxor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bxor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/xor_u32.masm b/tests/integration/expected/xor_u32.masm
index fc4c6360e..7dad2f61d 100644
--- a/tests/integration/expected/xor_u32.masm
+++ b/tests/integration/expected/xor_u32.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_972d35b4c4e5a4bf3450bff55d3407152f81ce2206ea8e96de43f1800f0f5f59
 
 export.entrypoint
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_972d35b4c4e5a4bf3450bff55d3407152f81ce2206ea8e96de43f1800f0f5f59
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_972d35b4c4e5a4bf3450bff55d3407152f81ce2206ea8e96de43f1800f0f5f59::entrypoint
 end
+
diff --git a/tests/integration/expected/xor_u32.wat b/tests/integration/expected/xor_u32.wat
index 88bdbd192..642abf7a9 100644
--- a/tests/integration/expected/xor_u32.wat
+++ b/tests/integration/expected/xor_u32.wat
@@ -1,4 +1,4 @@
-(module $972d35b4c4e5a4bf3450bff55d3407152f81ce2206ea8e96de43f1800f0f5f59.wasm
+(module $test_rust_972d35b4c4e5a4bf3450bff55d3407152f81ce2206ea8e96de43f1800f0f5f59.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/expected/xor_u8.hir b/tests/integration/expected/xor_u8.hir
index 55a88539b..594c25304 100644
--- a/tests/integration/expected/xor_u8.hir
+++ b/tests/integration/expected/xor_u8.hir
@@ -1,16 +1,23 @@
-(module #noname
-    ;; Constants
-    (const (id 0) 0x00100000)
+(component 
+    ;; Modules
+    (module #test_rust_3bc685af363b80b89b9cea6b01602a2b50a6c4a8978e24e239a9e9fac3fdccb4
+        ;; Constants
+        (const (id 0) 0x00100000)
 
-    ;; Global Variables
-    (global (export #__stack_pointer) (id 0) (type i32) (const 0))
-    (global (export #gv1) (id 1) (type i32) (const 0))
-    (global (export #gv2) (id 2) (type i32) (const 0))
+        ;; Global Variables
+        (global (export #__stack_pointer) (id 0) (type i32) (const 0))
+        (global (export #gv1) (id 1) (type i32) (const 0))
+        (global (export #gv2) (id 2) (type i32) (const 0))
 
-    ;; Functions
-    (func (export #entrypoint) (param i32) (param i32) (result i32)
-        (block 0 (param v0 i32) (param v1 i32)
-            (let (v3 i32) (bxor v1 v0))
-            (ret v3))
+        ;; Functions
+        (func (export #entrypoint) (param i32) (param i32) (result i32)
+            (block 0 (param v0 i32) (param v1 i32)
+                (let (v3 i32) (bxor v1 v0))
+                (br (block 1 v3)))
+
+            (block 1 (param v2 i32)
+                (ret v2))
+        )
     )
+
 )
diff --git a/tests/integration/expected/xor_u8.masm b/tests/integration/expected/xor_u8.masm
index fc4c6360e..66f3c85d4 100644
--- a/tests/integration/expected/xor_u8.masm
+++ b/tests/integration/expected/xor_u8.masm
@@ -1,668 +1,14 @@
-mod intrinsics::i32
-
-export.is_signed
-  push.2147483648
-  u32and
-  push.2147483648
-  eq
-end
-
-export.unchecked_neg
-  u32not
-  u32wrapping_add.1
-end
-
-export.checked_neg
-  dup.0
-  push.2147483648
-  eq
-  assertz
-  exec.unchecked_neg
-end
-
-export.overflowing_add
-  u32assert2
-  dup.0
-  exec.is_signed
-  dup.2
-  exec.is_signed
-  dup.1
-  eq
-  movup.3
-  movup.3
-  u32wrapping_add
-  dup.0
-  exec.is_signed
-  movup.3
-  neq
-  movup.2
-  and
-end
-
-export.wrapping_add
-  exec.overflowing_add
-  drop
-end
-
-export.checked_add
-  exec.overflowing_add
-  assertz
-end
-
-export.overflowing_sub
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  if.true
-    drop
-    push.2147483647
-    dup.1
-    exec.is_signed
-    dup.0
-    eq.0
-    movup.3
-    movup.3
-    u32wrapping_add
-    push.1
-    u32wrapping_add
-    dup.0
-    exec.is_signed
-    movup.3
-    neq
-    movup.2
-    and
-  else
-    exec.unchecked_neg
-    exec.overflowing_add
-  end
-end
-
-export.wrapping_sub
-  exec.overflowing_sub
-  drop
-end
-
-export.checked_sub
-  exec.overflowing_sub
-  assertz
-end
-
-export.overflowing_mul
-  u32assert2
-  dup.0
-  push.2147483648
-  eq
-  dup.2
-  push.2147483648
-  eq
-  or
-  if.true
-    dup.0
-    eq.1
-    dup.2
-    eq.1
-    or
-    movup.2
-    push.4294967295
-    eq
-    movup.2
-    push.4294967295
-    eq
-    or
-    dup.1
-    or
-    push.2147483648
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    not
-  else
-    dup.0
-    exec.is_signed
-    dup.2
-    exec.is_signed
-    dup.1
-    dup.1
-    neq
-    movdn.4
-    movup.3
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    swap.2
-    dup.0
-    exec.unchecked_neg
-    movup.2
-    cdrop
-    u32overflowing_mul
-    dup.1
-    exec.is_signed
-    or
-    swap.1
-    dup.0
-    exec.unchecked_neg
-    movup.3
-    cdrop
-    swap.1
-  end
-end
-
-export.wrapping_mul
-  exec.overflowing_mul
-  drop
-end
-
-export.checked_mul
-  exec.overflowing_mul
-  assertz
-end
-
-export.checked_div
-  u32assert2
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.4
-  cdrop
-  dup.1
-  exec.unchecked_neg
-  dup.2
-  swap.1
-  movup.3
-  exec.is_signed
-  dup.0
-  movdn.5
-  cdrop
-  u32div
-  movdn.2
-  neq
-  dup.1
-  exec.unchecked_neg
-  swap.1
-  cdrop
-end
-
-export.icmp
-  dup.1
-  dup.1
-  push.2147483648
-  u32and
-  swap.1
-  push.2147483648
-  u32and
-  eq.0
-  swap.1
-  eq.0
-  swap.1
-  dup.1
-  neq
-  if.true
-    movdn.2
-    drop
-    drop
-    push.4294967295
-    push.1
-    swap.2
-    cdrop
-  else
-    drop
-    dup.1
-    dup.1
-    u32gt
-    movdn.2
-    u32lt
-    push.0
-    push.4294967295
-    push.1
-    swap.3
-    cdrop
-    swap.2
-    cdrop
-  end
-end
-
-export.is_lt
-  exec.icmp
-  push.4294967295
-  eq
-end
-
-export.is_lte
-  exec.icmp
-  neq.1
-end
-
-export.is_gt
-  exec.icmp
-  eq.1
-end
-
-export.is_gte
-  exec.icmp
-  push.4294967295
-  neq
-end
-
-export.pow2
-  dup.0
-  push.31
-  u32lt
-  assert
-  push.1
-  swap.1
-  u32shl
-end
-
-export.ipow
-  dup.0
-  push.31
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    push.1
-    push.0
-    swap.2
-    cdrop
-    swap.1
-    drop
-  else
-    push.1
-    dup.1
-    push.1
-    u32gt
-    while.true
-      dup.2
-      dup.1
-      u32wrapping_mul
-      dup.2
-      push.1
-      u32and
-      eq.1
-      cdrop
-      swap.1
-      u32div.2
-      movup.2
-      dup.0
-      u32wrapping_mul
-      swap.1
-      movup.2
-      dup.1
-      push.1
-      u32gt
-    end
-    swap.1
-    drop
-    u32wrapping_mul
-  end
-end
-
-export.checked_shr
-  dup.0
-  push.32
-  u32lt
-  assert
-  dup.0
-  eq.0
-  dup.2
-  eq.0
-  or
-  if.true
-    eq.0
-    swap.1
-    push.0
-    swap.2
-    cdrop
-  else
-    dup.1
-    push.2147483648
-    u32and
-    push.2147483648
-    eq
-    if.true
-      swap.1
-      dup.1
-      u32shr
-      push.1
-      dup.2
-      u32shl
-      sub.1
-      push.32
-      movup.3
-      sub
-      u32shl
-      u32or
-      u32assert
-    else
-      u32shr
-      u32assert
-    end
-  end
-end
-
-mod intrinsics::mem
-
-export.extract_element
-  dup.0
-  push.3
-  lte
-  assert
-  dup.0
-  push.3
-  lt
-  movdn.5
-  dup.0
-  push.2
-  lt
-  movdn.5
-  push.1
-  lt
-  cdrop
-  movup.3
-  cdrop
-  movup.2
-  cdrop
-end
-
-proc.load_felt_unchecked
-  padw
-  movup.4
-  mem_loadw
-  movup.4
-  exec.extract_element
-end
-
-export.load_felt
-  movup.2
-  assertz
-  exec.load_felt_unchecked
-end
-
-export.load_sw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    exec.load_felt_unchecked
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.3
-      movup.3
-      drop
-      drop
-      dup.2
-      u32shl
-      swap.1
-      push.32
-      movup.3
-      u32overflowing_sub
-      assertz
-      u32shr
-      u32or
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movdn.2
-        movdn.2
-        drop
-        dup.2
-        u32shl
-        swap.1
-        push.32
-        movup.3
-        u32overflowing_sub
-        assertz
-        u32shr
-        u32or
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          dup.2
-          u32shl
-          swap.1
-          push.32
-          movup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          u32or
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movdn.4
-          drop
-          drop
-          drop
-          push.32
-          dup.3
-          u32overflowing_sub
-          assertz
-          u32shr
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          movup.2
-          u32shl
-          u32or
-        end
-      end
-    end
-  end
-end
-
-export.realign_dw
-  dup.3
-  u32shl
-  movdn.2
-  dup.0
-  push.32
-  dup.4
-  u32shr
-  movup.4
-  u32or
-  movdn.2
-  dup.3
-  u32shl
-  swap.1
-  push.32
-  movup.4
-  u32shr
-  u32or
-  swap.1
-end
-
-export.load_dw
-  dup.2
-  eq.0
-  dup.3
-  push.8
-  u32lt
-  assert
-  if.true
-    movup.2
-    drop
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      movup.4
-      drop
-      drop
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        movup.3
-        drop
-      else
-        swap.1
-        eq.2
-        if.true
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          movup.4
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-        end
-      end
-    end
-  else
-    dup.1
-    eq.0
-    if.true
-      swap.1
-      drop
-      padw
-      movup.4
-      mem_loadw
-      movup.4
-      drop
-      exec.realign_dw
-    else
-      dup.1
-      eq.1
-      if.true
-        swap.1
-        drop
-        padw
-        movup.4
-        mem_loadw
-        drop
-        exec.realign_dw
-      else
-        swap.1
-        eq.2
-        if.true
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          movup.4
-          drop
-          drop
-          drop
-          swap.1
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          exec.realign_dw
-        else
-          dup.0
-          u32overflowing_add.1
-          assertz
-          padw
-          movup.4
-          mem_loadw
-          movup.4
-          movup.4
-          drop
-          drop
-          movup.2
-          padw
-          movup.4
-          mem_loadw
-          drop
-          drop
-          drop
-          exec.realign_dw
-        end
-      end
-    end
-  end
-end
-
-mod noname
+mod test_rust_3bc685af363b80b89b9cea6b01602a2b50a6c4a8978e24e239a9e9fac3fdccb4
 
 export.entrypoint
   u32xor
 end
 
-program
+mod zzz_entrypoint_module
 
-use noname
+use.test_rust_3bc685af363b80b89b9cea6b01602a2b50a6c4a8978e24e239a9e9fac3fdccb4
 
-begin
-  exec.noname::entrypoint
+export.entrypoint_wrapper
+  exec.test_rust_3bc685af363b80b89b9cea6b01602a2b50a6c4a8978e24e239a9e9fac3fdccb4::entrypoint
 end
+
diff --git a/tests/integration/expected/xor_u8.wat b/tests/integration/expected/xor_u8.wat
index 479be9f77..5f14341db 100644
--- a/tests/integration/expected/xor_u8.wat
+++ b/tests/integration/expected/xor_u8.wat
@@ -1,4 +1,4 @@
-(module $3bc685af363b80b89b9cea6b01602a2b50a6c4a8978e24e239a9e9fac3fdccb4.wasm
+(module $test_rust_3bc685af363b80b89b9cea6b01602a2b50a6c4a8978e24e239a9e9fac3fdccb4.wasm
   (type (;0;) (func (param i32 i32) (result i32)))
   (func $entrypoint (;0;) (type 0) (param i32 i32) (result i32)
     local.get 1
diff --git a/tests/integration/src/compiler_test.rs b/tests/integration/src/compiler_test.rs
index 92ce6b53c..787df9c63 100644
--- a/tests/integration/src/compiler_test.rs
+++ b/tests/integration/src/compiler_test.rs
@@ -1,5 +1,3 @@
-#![allow(dead_code)]
-
 use core::panic;
 use std::{
     fs,
@@ -10,16 +8,10 @@ use std::{
 };
 
 use miden_assembly::{Assembler, AssemblyContext};
-use miden_codegen_masm::{Function, MasmCompiler, Module};
-use miden_diagnostics::{
-    term::termcolor::ColorChoice, CodeMap, DefaultEmitter, DiagnosticsConfig, DiagnosticsHandler,
-    Emitter, NullEmitter, SourceSpan, Verbosity,
-};
+use miden_codegen_masm::{Function, Module};
+use miden_diagnostics::{CodeMap, SourceSpan};
 use miden_frontend_wasm::{translate, WasmTranslationConfig};
-use miden_hir::{
-    pass::{AnalysisManager, RewritePass, RewriteSet},
-    FunctionIdent, Ident, ModuleRewritePassAdapter, ProgramBuilder, Signature, Symbol,
-};
+use miden_hir::{FunctionIdent, Ident, Signature, Symbol};
 use miden_stdlib::StdLibrary;
 use midenc_session::{
     InputFile, InputType, Options, OutputType, OutputTypeSpec, OutputTypes, ProjectType, Session,
@@ -238,10 +230,7 @@ impl CompilerTest {
         });
         let input_file = InputFile::from_path(wasm_artifacts.first().unwrap()).unwrap();
         Self {
-            config: WasmTranslationConfig {
-                override_name: Some(artifact_name.to_string().into()),
-                ..Default::default()
-            },
+            config: WasmTranslationConfig::default(),
             session: default_session(input_file),
             source: CompilerTestSource::RustCargoLib { artifact_name },
             entrypoint,
@@ -289,11 +278,6 @@ impl CompilerTest {
             .join("release")
             .join(artifact_name)
             .with_extension("wasm");
-        // dbg!(&target_bin_file_path);
-        // let mut target_bin_file = fs::File::open(target_bin_file_path).unwrap();
-        // let mut wasm_bytes = vec![];
-        // Read::read_to_end(&mut target_bin_file, &mut wasm_bytes).unwrap();
-        // fs::remove_dir_all(target_dir).unwrap();
 
         let input_file = InputFile::from_path(target_bin_file_path).unwrap();
         let session = default_session(input_file);
@@ -302,10 +286,7 @@ impl CompilerTest {
             function: Ident::new(Symbol::intern(entrypoint.to_string()), SourceSpan::default()),
         };
         CompilerTest {
-            config: WasmTranslationConfig {
-                override_name: Some(artifact_name.to_string().into()),
-                ..Default::default()
-            },
+            config: WasmTranslationConfig::default(),
             session,
             source: CompilerTestSource::RustCargo {
                 cargo_project_folder_name: cargo_project_folder.to_string(),
@@ -322,10 +303,7 @@ impl CompilerTest {
         let wasm_file = compile_rust_file(rust_source);
         let session = default_session(wasm_file);
         CompilerTest {
-            config: WasmTranslationConfig {
-                override_name: Some("noname".into()),
-                ..Default::default()
-            },
+            config: WasmTranslationConfig::default(),
             session,
             source: CompilerTestSource::Rust(rust_source.to_string()),
             entrypoint: None,
@@ -352,10 +330,11 @@ impl CompilerTest {
             rust_source
         );
         let wasm_file = compile_rust_file(&rust_source);
+        let wasm_filestem = wasm_file.filestem().to_string();
         let session = default_session(wasm_file);
         let entrypoint = FunctionIdent {
             module: Ident {
-                name: Symbol::intern("noname"),
+                name: Symbol::intern(wasm_filestem),
                 span: SourceSpan::default(),
             },
             function: Ident {
@@ -365,10 +344,7 @@ impl CompilerTest {
         };
 
         CompilerTest {
-            config: WasmTranslationConfig {
-                override_name: Some("noname".into()),
-                ..Default::default()
-            },
+            config: WasmTranslationConfig::default(),
             session,
             source: CompilerTestSource::Rust(rust_source.to_string()),
             entrypoint: Some(entrypoint),
@@ -449,47 +425,9 @@ impl CompilerTest {
     }
 
     fn wasm_to_ir(&self) -> HirArtifact {
-        use miden_hir_transform as transforms;
-        match &self.source {
-            CompilerTestSource::RustCargoComponent { .. } => {
-                // Wasm component is expected
-                let ir_component =
-                    translate(&self.wasm_bytes(), &self.config, &self.session.diagnostics)
-                        .expect("Failed to translate Wasm to IR component");
-                Box::new(ir_component).into()
-            }
-            CompilerTestSource::RustCargoLib { .. } => {
-                // Wasm module compiled as a module
-                let ir_component =
-                    translate(&self.wasm_bytes(), &self.config, &self.session.diagnostics)
-                        .expect("Failed to translate Wasm module to IR component");
-                Box::new(ir_component).into()
-            }
-            _ => {
-                // Wasm module compiled as a program
-                let mut ir_module =
-                    translate(&self.wasm_bytes(), &self.config, &self.session.diagnostics)
-                        .expect("Failed to translate Wasm to IR module")
-                        .unwrap_one_module();
-
-                let mut analyses = AnalysisManager::new();
-                let mut rewrites = RewriteSet::default();
-                rewrites.push(ModuleRewritePassAdapter::new(transforms::SplitCriticalEdges));
-                rewrites.push(ModuleRewritePassAdapter::new(transforms::Treeify));
-                rewrites.push(ModuleRewritePassAdapter::new(transforms::InlineBlocks));
-                rewrites
-                    .apply(&mut ir_module, &mut analyses, &self.session)
-                    .expect("Failed to apply rewrites");
-
-                let mut builder =
-                    ProgramBuilder::new(&self.session.diagnostics).with_module(ir_module).unwrap();
-                if let Some(entrypoint) = self.entrypoint.as_ref() {
-                    builder = builder.with_entrypoint(entrypoint.clone());
-                }
-                let hir_program = builder.link().expect("Failed to link IR program");
-                hir_program.into()
-            }
-        }
+        let ir_component = translate(&self.wasm_bytes(), &self.config, &self.session.diagnostics)
+            .expect("Failed to translate Wasm binary to IR component");
+        Box::new(ir_component).into()
     }
 
     /// Get the compiled IR, compiling the Wasm if it has not been compiled yet
@@ -567,15 +505,7 @@ impl CompilerTest {
     /// Get the compiled MASM as [`miden_codegen_masm::Program`]
     pub fn ir_masm_program(&mut self) -> Arc<miden_codegen_masm::Program> {
         if self.ir_masm.is_none() {
-            let mut compiler = MasmCompiler::new(&self.session);
-            let hir = self.hir.take().expect("IR is not compiled");
-            let ir_masm = match hir {
-                HirArtifact::Program(hir_program) => compiler.compile(hir_program).unwrap(),
-                HirArtifact::Component(_) => self.compile_wasm_to_masm_program(),
-                HirArtifact::Module(_) => {
-                    todo!("Module to MASM compilation is not implemented yet")
-                }
-            };
+            let ir_masm = self.compile_wasm_to_masm_program();
             let frozen = ir_masm.freeze();
             self.ir_masm = Some(frozen);
         }
@@ -684,7 +614,7 @@ fn compile_rust_file(rust_source: &str) -> InputFile {
         "--target",
         "wasm32-unknown-unknown",
     ];
-    let file_name = hash_string(rust_source);
+    let file_name = format!("test_rust_{}", hash_string(rust_source));
     let proj_dir = std::env::temp_dir().join(&file_name);
     if proj_dir.exists() {
         fs::remove_dir_all(&proj_dir).unwrap();
@@ -709,28 +639,6 @@ fn compile_rust_file(rust_source: &str) -> InputFile {
     InputFile::from_path(output_file).unwrap()
 }
 
-fn default_emitter(verbosity: Verbosity, color: ColorChoice) -> Arc<dyn Emitter> {
-    match verbosity {
-        Verbosity::Silent => Arc::new(NullEmitter::new(color)),
-        _ => Arc::new(DefaultEmitter::new(color)),
-    }
-}
-
-fn make_diagnostics() -> DiagnosticsHandler {
-    let codemap = Arc::new(CodeMap::new());
-    let diagnostics = DiagnosticsHandler::new(
-        DiagnosticsConfig {
-            verbosity: Verbosity::Debug,
-            warnings_as_errors: false,
-            no_warn: false,
-            display: Default::default(),
-        },
-        codemap,
-        default_emitter(Verbosity::Debug, ColorChoice::Auto),
-    );
-    diagnostics
-}
-
 /// Create a default session for testing
 pub fn default_session(input_file: InputFile) -> Arc<Session> {
     let output_type = OutputType::Masm;
diff --git a/tests/integration/src/rust_masm_tests/apps.rs b/tests/integration/src/rust_masm_tests/apps.rs
index 8535da79c..5b593ff17 100644
--- a/tests/integration/src/rust_masm_tests/apps.rs
+++ b/tests/integration/src/rust_masm_tests/apps.rs
@@ -2,7 +2,7 @@ use expect_test::expect_file;
 use miden_hir::Felt;
 use proptest::{prelude::*, test_runner::TestRunner};
 
-use crate::{execute_emulator, execute_vm, CompilerTest};
+use crate::{execute_vm, CompilerTest};
 
 #[test]
 fn fib() {
@@ -12,20 +12,20 @@ fn fib() {
     test.expect_wasm(expect_file!["../../expected/fib.wat"]);
     test.expect_ir(expect_file!["../../expected/fib.hir"]);
     test.expect_masm(expect_file!["../../expected/fib.masm"]);
-    let ir_masm = test.ir_masm_program();
+    // let ir_masm = test.ir_masm_program();
     let vm_program = &test.vm_masm_program();
 
     // Run the Rust and compiled MASM code against a bunch of random inputs and compare the results
     TestRunner::default()
         .run(&(1u32..30), move |a| {
             let rust_out = miden_integration_tests_rust_fib::fib(a);
-            let mut args = [Felt::from(a)];
+            let args = [Felt::from(a)];
             let vm_out: u32 = execute_vm(&vm_program, &args).first().unwrap().clone().into();
             prop_assert_eq!(rust_out, vm_out);
-            args.reverse();
-            let emul_out: u32 =
-                execute_emulator(ir_masm.clone(), &args).first().unwrap().clone().into();
-            prop_assert_eq!(rust_out, emul_out);
+            // args.reverse();
+            // let emul_out: u32 =
+            //     execute_emulator(ir_masm.clone(), &args).first().unwrap().clone().into();
+            // prop_assert_eq!(rust_out, emul_out);
             Ok(())
         })
         .unwrap();