diff --git a/nautilus/test/data/expression-tests/after_ssa/addInt8AndInt32.trace b/nautilus/test/data/expression-tests/after_ssa/addInt8AndInt32.trace
index cec1c4d4..4be3abc0 100644
--- a/nautilus/test/data/expression-tests/after_ssa/addInt8AndInt32.trace
+++ b/nautilus/test/data/expression-tests/after_ssa/addInt8AndInt32.trace
@@ -1,4 +1,4 @@
 B0($1:i8,$2:i32)
 	CAST	$3	$1	:i32
 	ADD	$4	$3	$2	:i32
-	RETURN	$4	:i32
+	RETURN	$0	$4	:i32
diff --git a/nautilus/test/data/expression-tests/after_ssa/int16AddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/int16AddExpression.trace
index 32392b19..dcb66151 100644
--- a/nautilus/test/data/expression-tests/after_ssa/int16AddExpression.trace
+++ b/nautilus/test/data/expression-tests/after_ssa/int16AddExpression.trace
@@ -1,4 +1,4 @@
 B0($1:i16)
 	CONST	$2	5	:i16
-	ADD	$3	$1	$2	:i32
+	ADD	$3	$1	$2	:i16
 	RETURN	$0	$3	:i16
diff --git a/nautilus/test/data/expression-tests/after_ssa/int8AddExpression.trace b/nautilus/test/data/expression-tests/after_ssa/int8AddExpression.trace
index 8a9d0642..1d3289b4 100644
--- a/nautilus/test/data/expression-tests/after_ssa/int8AddExpression.trace
+++ b/nautilus/test/data/expression-tests/after_ssa/int8AddExpression.trace
@@ -1,4 +1,4 @@
 B0($1:i8)
 	CONST	$2	2	:i8
-	ADD	$3	$2	$1	:i32
+	ADD	$3	$2	$1	:i8
 	RETURN	$0	$3	:i8
diff --git a/nautilus/test/data/expression-tests/after_ssa/subInt8AndInt8.trace b/nautilus/test/data/expression-tests/after_ssa/subInt8AndInt8.trace
index ad91bab2..800f92f3 100644
--- a/nautilus/test/data/expression-tests/after_ssa/subInt8AndInt8.trace
+++ b/nautilus/test/data/expression-tests/after_ssa/subInt8AndInt8.trace
@@ -1,3 +1,3 @@
-B0($1:i8, $2:i8):
-	SUB     $3:i8, $1:i8, $2:i8
-	RETURN	$3	:i8
+B0($1:i8,$2:i8)
+	SUB	$3	$1	$2	:i8
+	RETURN	$0	$3	:i8
diff --git a/nautilus/test/data/expression-tests/tracing/addInt8AndInt32.trace b/nautilus/test/data/expression-tests/tracing/addInt8AndInt32.trace
index cec1c4d4..4be3abc0 100644
--- a/nautilus/test/data/expression-tests/tracing/addInt8AndInt32.trace
+++ b/nautilus/test/data/expression-tests/tracing/addInt8AndInt32.trace
@@ -1,4 +1,4 @@
 B0($1:i8,$2:i32)
 	CAST	$3	$1	:i32
 	ADD	$4	$3	$2	:i32
-	RETURN	$4	:i32
+	RETURN	$0	$4	:i32
diff --git a/nautilus/test/data/expression-tests/tracing/int16AddExpression.trace b/nautilus/test/data/expression-tests/tracing/int16AddExpression.trace
index 32392b19..dcb66151 100644
--- a/nautilus/test/data/expression-tests/tracing/int16AddExpression.trace
+++ b/nautilus/test/data/expression-tests/tracing/int16AddExpression.trace
@@ -1,4 +1,4 @@
 B0($1:i16)
 	CONST	$2	5	:i16
-	ADD	$3	$1	$2	:i32
+	ADD	$3	$1	$2	:i16
 	RETURN	$0	$3	:i16
diff --git a/nautilus/test/data/expression-tests/tracing/int8AddExpression.trace b/nautilus/test/data/expression-tests/tracing/int8AddExpression.trace
index 8a9d0642..1d3289b4 100644
--- a/nautilus/test/data/expression-tests/tracing/int8AddExpression.trace
+++ b/nautilus/test/data/expression-tests/tracing/int8AddExpression.trace
@@ -1,4 +1,4 @@
 B0($1:i8)
 	CONST	$2	2	:i8
-	ADD	$3	$2	$1	:i32
+	ADD	$3	$2	$1	:i8
 	RETURN	$0	$3	:i8
diff --git a/nautilus/test/data/expression-tests/tracing/subInt8AndInt8.trace b/nautilus/test/data/expression-tests/tracing/subInt8AndInt8.trace
index 168e0b15..800f92f3 100644
--- a/nautilus/test/data/expression-tests/tracing/subInt8AndInt8.trace
+++ b/nautilus/test/data/expression-tests/tracing/subInt8AndInt8.trace
@@ -1,3 +1,3 @@
 B0($1:i8,$2:i8)
 	SUB	$3	$1	$2	:i8
-	RETURN	$3	:i8
+	RETURN	$0	$3	:i8
diff --git a/nautilus/test/data/pointer-tests/after_ssa/addArray_i8.trace b/nautilus/test/data/pointer-tests/after_ssa/addArray_i8.trace
index 8ec03fed..2e7c5172 100644
--- a/nautilus/test/data/pointer-tests/after_ssa/addArray_i8.trace
+++ b/nautilus/test/data/pointer-tests/after_ssa/addArray_i8.trace
@@ -14,7 +14,7 @@ B1($3:i8,$4:i8,$1:ptr,$2:ptr)
 	MUL	$24	$23	$22	:ui64
 	ADD	$25	$2	$24	:ptr
 	LOAD	$28	$25	:i8
-	ADD	$29	$17	$28	:i32
+	ADD	$29	$17	$28	:i8
 	CAST	$30	$4	:i32
 	CONST	$34	1	:ui64
 	CAST	$35	$30	:ui64
diff --git a/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace b/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace
index 3c093fcc..a8274a73 100644
--- a/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace
+++ b/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_18__invokeEPNS_11CustomClassE($1)	:i32
+	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_08__invokeEPNS_11CustomClassE($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/pointer-tests/ir/castCustomClass.trace b/nautilus/test/data/pointer-tests/ir/castCustomClass.trace
index 26e7a5be..6cf8c0ca 100644
--- a/nautilus/test/data/pointer-tests/ir/castCustomClass.trace
+++ b/nautilus/test/data/pointer-tests/ir/castCustomClass.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:ptr):
-	$2 = _ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_18__invokeEPNS_11CustomClassE($1) :i32
+	$2 = _ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_08__invokeEPNS_11CustomClassE($1) :i32
 	return ($2) :i32
 }
 } //NESIR
\ No newline at end of file
diff --git a/nautilus/test/data/pointer-tests/tracing/addArray_i8.trace b/nautilus/test/data/pointer-tests/tracing/addArray_i8.trace
index 27ce0df1..1087d486 100644
--- a/nautilus/test/data/pointer-tests/tracing/addArray_i8.trace
+++ b/nautilus/test/data/pointer-tests/tracing/addArray_i8.trace
@@ -24,7 +24,7 @@ B1()
 	ASSIGN	$26	$25	:ptr
 	ASSIGN	$27	$26	:ptr
 	LOAD	$28	$27	:i8
-	ADD	$29	$17	$28	:i32
+	ADD	$29	$17	$28	:i8
 	CAST	$30	$4	:i32
 	ASSIGN	$31	$1	:ptr
 	ASSIGN	$32	$30	:i32
diff --git a/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace b/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace
index 3c093fcc..a8274a73 100644
--- a/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace
+++ b/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_18__invokeEPNS_11CustomClassE($1)	:i32
+	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_08__invokeEPNS_11CustomClassE($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace
index 64d59281..e880bf06 100644
--- a/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace
@@ -1,3 +1,3 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_28__invokeEi($1)	:i32
+	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace
index ae788cab..0961767b 100644
--- a/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace
@@ -1,4 +1,4 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_48__invokeEi($1)	:i32
-	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_38__invokeEi($2)	:i32
+	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_18__invokeEi($1)	:i32
+	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($2)	:i32
 	RETURN	$0	$3	:i32
diff --git a/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace
index 0f0859fc..c036aa6b 100644
--- a/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:i32):
-	$2 = _ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_28__invokeEi($1) :i32
+	$2 = _ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($1) :i32
 	return ($2) :i32
 }
 } //NESIR
\ No newline at end of file
diff --git a/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace
index 3badd1a4..436fba16 100644
--- a/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace
@@ -1,8 +1,8 @@
 NautilusIr {
 execute() {
 Block_0($1:i32):
-	$2 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_48__invokeEi($1) :i32
-	$3 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_38__invokeEi($2) :i32
+	$2 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_18__invokeEi($1) :i32
+	$3 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($2) :i32
 	return ($3) :i32
 }
 } //NESIR
\ No newline at end of file
diff --git a/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace
index 64d59281..e880bf06 100644
--- a/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace
@@ -1,3 +1,3 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_28__invokeEi($1)	:i32
+	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace
index ae788cab..0961767b 100644
--- a/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace
+++ b/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace
@@ -1,4 +1,4 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_48__invokeEi($1)	:i32
-	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_38__invokeEi($2)	:i32
+	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_18__invokeEi($1)	:i32
+	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_08__invokeEi($2)	:i32
 	RETURN	$0	$3	:i32
diff --git a/nautilus/test/execution-tests/CMakeLists.txt b/nautilus/test/execution-tests/CMakeLists.txt
index 45aa0fea..279b58ba 100644
--- a/nautilus/test/execution-tests/CMakeLists.txt
+++ b/nautilus/test/execution-tests/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
 
 catch_discover_tests(nautilus-execution-tests EXTRA_ARGS --allow-running-no-tests)
 
-if (ENABLE_TRACING)
+if (ENABLE_TRACING AND (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
     # using Clang
     add_executable(nautilus-tracing-tests
             TracingTest.cpp