diff --git a/lang/tests/son_tests_different_function_destinations.txt b/lang/tests/son_tests_different_function_destinations.txt
index 22d755546..adc56877c 100644
--- a/lang/tests/son_tests_different_function_destinations.txt
+++ b/lang/tests/son_tests_different_function_destinations.txt
@@ -10,52 +10,50 @@ main:
     LI64 r32, 300d
     CP r1, r32
     JMP :1
- 0: LI64 r35, 1d
-    ST r35, r32, 0a, 8h
-    ST r35, r32, 8a, 8h
-    ST r33, r32, 0a, 8h
+ 0: ST r33, r32, 0a, 8h
     LD r34, r32, 0a, 8h
     JEQ r34, r33, :2
     LI64 r32, 200d
     CP r1, r32
     JMP :1
- 2: LI64 r36, 3d
-    ST r35, r32, 0a, 8h
-    ST r35, r32, 8a, 8h
-    ADDI64 r37, r254, 16d
-    ST r35, r254, 16a, 8h
-    ST r35, r254, 24a, 8h
-    ST r35, r254, 32a, 8h
-    ST r35, r254, 40a, 8h
-    ST r35, r254, 48a, 8h
-    ST r35, r254, 56a, 8h
+ 2: LI64 r35, 3d
+    LI64 r36, 1d
+    ST r36, r32, 0a, 8h
+    ST r36, r32, 8a, 8h
+    ADDI64 r37, r254, 32d
+    ST r36, r254, 32a, 8h
+    ST r36, r254, 40a, 8h
+    ST r36, r254, 48a, 8h
+    ST r36, r254, 56a, 8h
+    ST r36, r254, 64a, 8h
+    ST r36, r254, 72a, 8h
     CP r32, r33
- 8: JNE r32, r36, :3
-    LD r32, r254, 48a, 8h
+ 8: JNE r32, r35, :3
+    LD r32, r254, 64a, 8h
     JEQ r32, r33, :4
     LI64 r32, 100d
     CP r1, r32
     JMP :1
  4: ST r33, r254, 0a, 8h
     ST r33, r254, 8a, 8h
-    ST r33, r254, 64a, 8h
-    ST r33, r254, 72a, 8h
-    ST r35, r254, 16a, 8h
-    ST r35, r254, 24a, 8h
-    ST r35, r254, 32a, 8h
-    ST r35, r254, 40a, 8h
-    ST r35, r254, 48a, 8h
-    ST r35, r254, 56a, 8h
+    ST r33, r254, 16a, 8h
+    ST r33, r254, 24a, 8h
+    ST r36, r254, 32a, 8h
+    ST r36, r254, 40a, 8h
+    ST r36, r254, 48a, 8h
+    ST r36, r254, 56a, 8h
+    ST r36, r254, 64a, 8h
+    ST r36, r254, 72a, 8h
     CP r32, r33
- 7: LD r38, r254, 48a, 8h
-    JNE r32, r36, :5
+ 7: LD r38, r254, 64a, 8h
+    JNE r32, r35, :5
     JEQ r38, r33, :6
     LI64 r32, 10d
     CP r1, r32
     JMP :1
  6: CP r1, r33
     JMP :1
- 5: ADD64 r34, r32, r35
+ 5: ADD64 r34, r32, r36
     MULI64 r32, r32, 16d
     ADD64 r32, r37, r32
     ST r33, r32, 0a, 8h
@@ -66,7 +64,7 @@ main:
     ADD64 r34, r37, r34
     JAL r31, r0, :new_stru
     ST r1, r34, 0a, 16h
-    ADD64 r32, r32, r35
+    ADD64 r32, r32, r36
     JMP :8
  1: LD r31, r254, 80a, 64h
     ADDI64 r254, r254, 144d
@@ -79,6 +77,6 @@ new_stru:
     LD r1, r13, 0a, 16h
     ADDI64 r254, r254, 16d
     JALA r0, r31, 0a
-code size: 765
+code size: 739
 ret: 0
 status: Ok(())
diff --git a/lang/tests/son_tests_generic_functions.txt b/lang/tests/son_tests_generic_functions.txt
index 3e56d70d0..be16b150d 100644
--- a/lang/tests/son_tests_generic_functions.txt
+++ b/lang/tests/son_tests_generic_functions.txt
@@ -10,9 +10,12 @@ add:
     ADD32 r13, r13, r14
     CP r1, r13
     JALA r0, r31, 0a
+add:
+    JALA r0, r31, 0a
 main:
     ADDI64 r254, r254, -32d
     ST r31, r254, 0a, 32h
+    JAL r31, r0, :add
     LI32 r32, 2w
     CP r2, r32
     CP r3, r32
@@ -30,6 +33,6 @@ main:
     LD r31, r254, 0a, 32h
     ADDI64 r254, r254, 32d
     JALA r0, r31, 0a
-code size: 191
+code size: 209
 ret: 0
 status: Ok(())