diff --git a/test/test.answers b/test/test.answers
index c663244..88da26d 100644
--- a/test/test.answers
+++ b/test/test.answers
@@ -30,7 +30,7 @@ cff2e265d151bd2fa1713753543f78e2c9677470ffe220753660079a74025406  test/results/t
 0cc6f7b9d753a2734e789b35d8cba7e10f65f17fc126a2efef403a49bd1b739c  test/results/test0004-x86-binary
 4b40361fe6e936ffc2f8f0afe46ec5c0c66b4bb3b30f56c84e18036f8b063e5a  test/results/test0005-aarch64-binary
 ffc4a4da0880744053cba103abbde9fdd50bd5e298d0c8c51407d087b1b067dd  test/results/test0005-amd64-binary
-4d4d927953757473df56c7033996891acb5bae32510d92b5159e7aaf56c03d72  test/results/test0005-armv7l-binary
+420ed88f5c9e026dc669d8e9d59e2bf12194af2ca5727e327297cd85607a6a81  test/results/test0005-armv7l-binary
 66f964f025449632862eb190e668210a63535ae9d8c0dabde38c84f08f97b80b  test/results/test0005-knight-native-binary
 0278a97a86caf2c6a0b88214471d4f7f30c6b9b9361070e0b778211f4855e6bf  test/results/test0005-knight-posix-binary
 74f63fbaafd2cd097fdbc10dd9e2919f35a7477042dd6f02a85a8f0cf330d199  test/results/test0005-x86-binary
@@ -40,7 +40,7 @@ f8134ad470e5e044aef91ee72882111a750162b1b4ebdb8a4027e548126a1ea3  test/results/t
 285e9916e79075d4a4b5cfc947cc5d27df44edc9ebe091fae1095efd3a39110f  test/results/test0006-knight-native-binary
 4d90b082711dd7108e261d9acb353793e53e97b3c0bb00275d43a2bcb6ea34d0  test/results/test0006-knight-posix-binary
 2fdab9370f3dca78c682f3334f393fb4a2d68c51f901006abe826b2b559cedab  test/results/test0006-x86-binary
-d65943dfce2047da4f2e6827ef484ab92f5369ee0d7d2e2d4a7e1c37b4dbaead  test/results/test0007-aarch64-binary
+d287f8ff8a7aa53e19ff9a8c772c374b1178016e0459097a91d36f69b7776345  test/results/test0007-aarch64-binary
 cfa4382e0e3edd23ed8a292fa8e8630ac3ca90eb424e4fd241f3509705dd7943  test/results/test0007-amd64-binary
 876a38b259618a2c30e681c3f8ed624d9fd2a2873cb1e70dc826c444a004d535  test/results/test0007-armv7l-binary
 dc543f40901704ce9f352308c7759c8b581395f8683cfa248a03410dc3dc24bd  test/results/test0007-knight-native-binary
@@ -48,7 +48,7 @@ fffb165db40690ad5528028cb46f124bf1dab16e616b78fa037becc4428ac200  test/results/t
 de50c7139b401b684d34d9365f62301dd168a3a0c97e7cf325d84b7c0ca0af74  test/results/test0007-x86-binary
 92e05eff2ad5a0eb414c916573bf75fadbfcd758fe0ab7f85d65de7ab3973518  test/results/test0008-aarch64-binary
 ab6c8c172b61d24374f1a387d1d02aadf3fab69c32f9d47c311928750725a2d4  test/results/test0008-amd64-binary
-56765c0450f35869f2a7cfeab39b4e52b1a3a94f69c3ee52ad4bd42a1df3dfe8  test/results/test0008-armv7l-binary
+17b4a191b57c66d40b3844c832d3892c3711dffc4605ca48130b723e8bbe795e  test/results/test0008-armv7l-binary
 b54dd7a53e4e7619e7fe1761b827cfdf0c24b2317084ec7c06a7403c5d51c651  test/results/test0008-knight-native-binary
 1d5a1d4f3197d1a0d6cc23fd681313fedfa450d402a1e1a25e47bacf5ee8241c  test/results/test0008-knight-posix-binary
 f741233af242dba7df5e1c199c0c2f51ead1df049d3bd872c52d81feaaccb6af  test/results/test0008-x86-binary
@@ -173,7 +173,7 @@ d76e571526ae35c59bb2d022ed52ae5ff7d79a6790939c3251458d4cad0a4f75  test/results/t
 54621f85782514a4fb8c16d8cf2796f6b88484ab0d06c379bf1d916d67fbd5bb  test/results/test0105-amd64-binary
 d14529ef7c2c2af6a911027a33f05c14b1f772e8df29f28ed103c69c653ee442  test/results/test0105-armv7l-binary
 46a5e68ffa6c12cbbfa6229926a0af08d3331bef41d233f3ac4a0335fe385c27  test/results/test0105-x86-binary
-ca9fdf7c6720b7aff8a37a60608b89bb4a6941aa323c7038e0bcbb01af9a568d  test/results/test0106-aarch64-binary
+882fd086cb6688e26c60ae80351bb7a207843ae4169cd68a9eb2cb1db24b47ff  test/results/test0106-aarch64-binary
 447d78cd2526ef97cdf02f72bc2f492765f7c076c598cf3dbd3e8dd4507740b7  test/results/test0106-amd64-binary
 ba2e2e1bbe66fea15d5984678175229fcb0adc6faa394be2cfde8bea1d3026de  test/results/test0106-armv7l-binary
 698853b79efb30865a663c4863c050639eb21c7400008f7840830503928973d4  test/results/test0106-knight-native-binary
diff --git a/test/test0005/hello-armv7l.sh b/test/test0005/hello-armv7l.sh
index 1550f6f..3f9c3d6 100755
--- a/test/test0005/hello-armv7l.sh
+++ b/test/test0005/hello-armv7l.sh
@@ -29,21 +29,14 @@ bin/M2-Planet \
 	-f M2libc/armv7l/Linux/fcntl.h \
 	-f M2libc/stdio.c \
 	-f test/test0005/string.c \
-	--debug \
 	-o ${TMPDIR}/string.M1 \
 	|| exit 1
 
-blood-elf \
-	-f ${TMPDIR}/string.M1 \
-	-o ${TMPDIR}/string-footer.M1 \
-	|| exit 2
-
 # Macro assemble with libc written in M1-Macro
 M1 \
 	-f M2libc/armv7l/armv7l_defs.M1 \
 	-f M2libc/armv7l/libc-full.M1 \
 	-f ${TMPDIR}/string.M1 \
-	-f ${TMPDIR}/string-footer.M1 \
 	--little-endian \
 	--architecture armv7l \
 	-o ${TMPDIR}/string.hex2 \
@@ -51,7 +44,7 @@ M1 \
 
 # Resolve all linkages
 hex2 \
-	-f M2libc/armv7l/ELF-armv7l-debug.hex2 \
+	-f M2libc/armv7l/ELF-armv7l.hex2 \
 	-f ${TMPDIR}/string.hex2 \
 	--little-endian \
 	--architecture armv7l \
diff --git a/test/test0007/hello-aarch64.sh b/test/test0007/hello-aarch64.sh
index c2d15b1..c3f7a62 100755
--- a/test/test0007/hello-aarch64.sh
+++ b/test/test0007/hello-aarch64.sh
@@ -29,25 +29,14 @@ bin/M2-Planet \
 	-f M2libc/aarch64/Linux/fcntl.h \
 	-f M2libc/stdio.c \
 	-f test/test0007/do.c \
-	--debug \
 	-o ${TMPDIR}/do.M1 \
 	|| exit 1
 
-# Build debug footer
-blood-elf \
-	--64 \
-	-f ${TMPDIR}/do.M1 \
-	--entry _start \
-	-o ${TMPDIR}/do-footer.M1 \
-	|| exit 2
-
-
 # Macro assemble with libc written in M1-Macro
 M1 \
 	-f M2libc/aarch64/aarch64_defs.M1 \
 	-f M2libc/aarch64/libc-full.M1 \
 	-f ${TMPDIR}/do.M1 \
-	-f ${TMPDIR}/do-footer.M1 \
 	--little-endian \
 	--architecture aarch64 \
 	-o ${TMPDIR}/do.hex2 \
@@ -55,7 +44,7 @@ M1 \
 
 # Resolve all linkages
 hex2 \
-	-f M2libc/aarch64/ELF-aarch64-debug.hex2 \
+	-f M2libc/aarch64/ELF-aarch64.hex2 \
 	-f ${TMPDIR}/do.hex2 \
 	--little-endian \
 	--architecture aarch64 \
diff --git a/test/test0008/hello-armv7l.sh b/test/test0008/hello-armv7l.sh
index cab02fb..f58d4d3 100755
--- a/test/test0008/hello-armv7l.sh
+++ b/test/test0008/hello-armv7l.sh
@@ -29,14 +29,23 @@ bin/M2-Planet \
 	-f M2libc/armv7l/Linux/fcntl.h \
 	-f M2libc/stdio.c \
 	-f test/test0008/struct.c \
+	--debug \
 	-o ${TMPDIR}/struct.M1 \
 	|| exit 1
 
+# Build debug footer
+blood-elf \
+	-f ${TMPDIR}/struct.M1 \
+	--entry _start \
+	-o ${TMPDIR}/struct-footer.M1 \
+	|| exit 2
+
 # Macro assemble with libc written in M1-Macro
 M1 \
 	-f M2libc/armv7l/armv7l_defs.M1 \
 	-f M2libc/armv7l/libc-full.M1 \
 	-f ${TMPDIR}/struct.M1 \
+	-f ${TMPDIR}/struct-footer.M1 \
 	--little-endian \
 	--architecture armv7l \
 	-o ${TMPDIR}/struct.hex2 \
@@ -44,7 +53,7 @@ M1 \
 
 # Resolve all linkages
 hex2 \
-	-f M2libc/armv7l/ELF-armv7l.hex2 \
+	-f M2libc/armv7l/ELF-armv7l-debug.hex2 \
 	-f ${TMPDIR}/struct.hex2 \
 	--little-endian \
 	--architecture armv7l \
diff --git a/test/test0106/hello-aarch64.sh b/test/test0106/hello-aarch64.sh
index bf50e60..80f80c1 100755
--- a/test/test0106/hello-aarch64.sh
+++ b/test/test0106/hello-aarch64.sh
@@ -29,23 +29,14 @@ bin/M2-Planet \
 	-f M2libc/aarch64/Linux/fcntl.h \
 	-f M2libc/stdio.c \
 	-f test/test0106/cc500.c \
-	--debug \
 	-o ${TMPDIR}/cc0.M1 \
 	|| exit 1
 
-blood-elf \
-	--64 \
-	-f ${TMPDIR}/cc0.M1 \
-	--entry _start \
-	-o ${TMPDIR}/cc0-footer.M1 \
-	|| exit 2
-
 # Macro assemble with libc written in M1-Macro
 M1 \
 	-f M2libc/aarch64/aarch64_defs.M1 \
 	-f M2libc/aarch64/libc-full.M1 \
 	-f ${TMPDIR}/cc0.M1 \
-	-f ${TMPDIR}/cc0-footer.M1 \
 	--little-endian \
 	--architecture aarch64 \
 	-o ${TMPDIR}/cc0.hex2 \
@@ -53,7 +44,7 @@ M1 \
 
 # Resolve all linkages
 hex2 \
-	-f M2libc/aarch64/ELF-aarch64-debug.hex2 \
+	-f M2libc/aarch64/ELF-aarch64.hex2 \
 	-f ${TMPDIR}/cc0.hex2 \
 	--little-endian \
 	--architecture aarch64 \