diff --git a/test/test0101/hello-aarch64.sh b/test/test0101/hello-aarch64.sh
index 729e947..4457f44 100755
--- a/test/test0101/hello-aarch64.sh
+++ b/test/test0101/hello-aarch64.sh
@@ -78,12 +78,13 @@ then
 	. ./sha256.sh
 	# Verify that the resulting file works
 	./test/results/test0101-aarch64-binary \
-	-f M2libc/x86/ELF-x86.hex2 \
-	-f test/test0101/test.hex2 \
-	--LittleEndian \
-	--architecture x86 \
-	--BaseAddress 0x8048000 \
-	-o test/test0101/proof || exit 7
+		-f M2libc/x86/ELF-x86.hex2 \
+		-f test/test0101/test.hex2 \
+		--LittleEndian \
+		--architecture x86 \
+		--BaseAddress 0x8048000 \
+		-o test/test0101/proof \
+		|| exit 7
 	out=$(sha256_check test/test0101/proof.answer)
 	[ "$out" = "test/test0101/proof: OK" ] || exit 8
 fi
diff --git a/test/test0101/hello-amd64.sh b/test/test0101/hello-amd64.sh
index e6ee30f..6f7e293 100755
--- a/test/test0101/hello-amd64.sh
+++ b/test/test0101/hello-amd64.sh
@@ -77,12 +77,14 @@ then
 
 	. ./sha256.sh
 	# Verify that the resulting file works
-	./test/results/test0101-amd64-binary -f M2libc/x86/ELF-x86.hex2 \
-	-f test/test0101/test.hex2 \
-	--LittleEndian \
-	--architecture x86 \
-	--BaseAddress 0x8048000 \
-	-o test/test0101/proof || exit 7
+	./test/results/test0101-amd64-binary \
+		-f M2libc/x86/ELF-x86.hex2 \
+		-f test/test0101/test.hex2 \
+		--LittleEndian \
+		--architecture x86 \
+		--BaseAddress 0x8048000 \
+		-o test/test0101/proof \
+		|| exit 7
 	out=$(sha256_check test/test0101/proof.answer)
 	[ "$out" = "test/test0101/proof: OK" ] || exit 8
 fi
diff --git a/test/test0101/hello-armv7l.sh b/test/test0101/hello-armv7l.sh
index 1ee38f0..954b17c 100755
--- a/test/test0101/hello-armv7l.sh
+++ b/test/test0101/hello-armv7l.sh
@@ -76,12 +76,14 @@ then
 
 	. ./sha256.sh
 	# Verify that the resulting file works
-	./test/results/test0101-armv7l-binary -f M2libc/x86/ELF-x86.hex2 \
-	-f test/test0101/test.hex2 \
-	--LittleEndian \
-	--architecture x86 \
-	--BaseAddress 0x8048000 \
-	-o test/test0101/proof || exit 7
+	./test/results/test0101-armv7l-binary \
+		-f M2libc/x86/ELF-x86.hex2 \
+		-f test/test0101/test.hex2 \
+		--LittleEndian \
+		--architecture x86 \
+		--BaseAddress 0x8048000 \
+		-o test/test0101/proof \
+		|| exit 7
 	out=$(sha256_check test/test0101/proof.answer)
 	[ "$out" = "test/test0101/proof: OK" ] || exit 8
 fi
diff --git a/test/test0101/hello-knight-posix.sh b/test/test0101/hello-knight-posix.sh
index adf9bc6..de0eb4a 100755
--- a/test/test0101/hello-knight-posix.sh
+++ b/test/test0101/hello-knight-posix.sh
@@ -66,12 +66,14 @@ then
 
 	. ./sha256.sh
 	# Verify that the resulting file works
-	./test/results/test0101-knight-posix-binary -f test/common_x86/ELF-i386.hex2 \
-	-f test/test0101/test.hex2 \
-	--LittleEndian \
-	--architecture x86 \
-	--BaseAddress 0x8048000 \
-	-o test/test0101/proof || exit 7
+	./test/results/test0101-knight-posix-binary \
+		-f test/common_x86/ELF-i386.hex2 \
+		-f test/test0101/test.hex2 \
+		--LittleEndian \
+		--architecture x86 \
+		--BaseAddress 0x8048000 \
+		-o test/test0101/proof \
+		|| exit 7
 	out=$(sha256_check test/test0101/proof.answer)
 	[ "$out" = "test/test0101/proof: OK" ] || exit 8
 fi
diff --git a/test/test0101/hello-x86.sh b/test/test0101/hello-x86.sh
index 087af93..9ef28f3 100755
--- a/test/test0101/hello-x86.sh
+++ b/test/test0101/hello-x86.sh
@@ -76,12 +76,14 @@ then
 
 	. ./sha256.sh
 	# Verify that the resulting file works
-	./test/results/test0101-x86-binary -f M2libc/x86/ELF-x86.hex2 \
-	-f test/test0101/test.hex2 \
-	--LittleEndian \
-	--architecture x86 \
-	--BaseAddress 0x8048000 \
-	-o test/test0101/proof || exit 7
+	./test/results/test0101-x86-binary \
+		-f M2libc/x86/ELF-x86.hex2 \
+		-f test/test0101/test.hex2 \
+		--LittleEndian \
+		--architecture x86 \
+		--BaseAddress 0x8048000 \
+		-o test/test0101/proof \
+		|| exit 7
 	out=$(sha256_check test/test0101/proof.answer)
 	[ "$out" = "test/test0101/proof: OK" ] || exit 8
 fi
diff --git a/test/test0102/hello-aarch64.sh b/test/test0102/hello-aarch64.sh
index d50be8b..609ba48 100755
--- a/test/test0102/hello-aarch64.sh
+++ b/test/test0102/hello-aarch64.sh
@@ -78,13 +78,14 @@ then
 	[ "$out" = "M1 1.0.0" ] || exit 6
 
 	# Verify that the resulting file works
-	./test/results/test0102-aarch64-binary -f \
-		M2libc/x86/x86_defs.M1 \
+	./test/results/test0102-aarch64-binary \
+		-f M2libc/x86/x86_defs.M1 \
 		-f M2libc/x86/libc-core.M1 \
 		-f test/test0100/test.M1 \
 		--LittleEndian \
 		--architecture x86 \
-		-o test/test0102/proof || exit 7
+		-o test/test0102/proof \
+		|| exit 7
 
 	. ./sha256.sh
 	out=$(sha256_check test/test0102/proof.answer)
diff --git a/test/test0102/hello-amd64.sh b/test/test0102/hello-amd64.sh
index f4893f8..cb79d1d 100755
--- a/test/test0102/hello-amd64.sh
+++ b/test/test0102/hello-amd64.sh
@@ -78,13 +78,14 @@ then
 	[ "$out" = "M1 1.0.0" ] || exit 6
 
 	# Verify that the resulting file works
-	./test/results/test0102-amd64-binary -f \
-		M2libc/x86/x86_defs.M1 \
+	./test/results/test0102-amd64-binary \
+		-f M2libc/x86/x86_defs.M1 \
 		-f M2libc/x86/libc-core.M1 \
 		-f test/test0100/test.M1 \
 		--LittleEndian \
 		--architecture x86 \
-		-o test/test0102/proof || exit 7
+		-o test/test0102/proof \
+		|| exit 7
 
 	. ./sha256.sh
 	out=$(sha256_check test/test0102/proof.answer)
diff --git a/test/test0102/hello-armv7l.sh b/test/test0102/hello-armv7l.sh
index 7ac609b..aae79b6 100755
--- a/test/test0102/hello-armv7l.sh
+++ b/test/test0102/hello-armv7l.sh
@@ -77,13 +77,14 @@ then
 	[ "$out" = "M1 1.0.0" ] || exit 6
 
 	# Verify that the resulting file works
-	./test/results/test0102-armv7l-binary -f \
-		M2libc/x86/x86_defs.M1 \
+	./test/results/test0102-armv7l-binary \
+		-f M2libc/x86/x86_defs.M1 \
 		-f M2libc/x86/libc-core.M1 \
 		-f test/test0100/test.M1 \
 		--LittleEndian \
 		--architecture x86 \
-		-o test/test0102/proof || exit 7
+		-o test/test0102/proof \
+		|| exit 7
 
 	. ./sha256.sh
 	out=$(sha256_check test/test0102/proof.answer)
diff --git a/test/test0102/hello-knight-posix.sh b/test/test0102/hello-knight-posix.sh
index e00aaa3..cb342d0 100755
--- a/test/test0102/hello-knight-posix.sh
+++ b/test/test0102/hello-knight-posix.sh
@@ -67,13 +67,14 @@ then
 	[ "$out" = "M1 1.0.0" ] || exit 6
 
 	# Verify that the resulting file works
-	./test/results/test0102-knight-posix-binary -f \
-		test/common_x86/x86_defs.M1 \
+	./test/results/test0102-knight-posix-binary \
+		-f test/common_x86/x86_defs.M1 \
 		-f test/common_x86/libc-core.M1 \
 		-f test/test0100/test.M1 \
 		--LittleEndian \
 		--architecture x86 \
-		-o test/test0102/proof || exit 7
+		-o test/test0102/proof \
+		|| exit 7
 
 	. ./sha256.sh
 	out=$(sha256_check test/test0102/proof.answer)
diff --git a/test/test0102/hello-x86.sh b/test/test0102/hello-x86.sh
index 8cbb9ba..b386493 100755
--- a/test/test0102/hello-x86.sh
+++ b/test/test0102/hello-x86.sh
@@ -77,13 +77,14 @@ then
 	[ "$out" = "M1 1.0.0" ] || exit 6
 
 	# Verify that the resulting file works
-	./test/results/test0102-x86-binary -f \
-		M2libc/x86/x86_defs.M1 \
+	./test/results/test0102-x86-binary \
+		-f M2libc/x86/x86_defs.M1 \
 		-f M2libc/x86/libc-core.M1 \
 		-f test/test0100/test.M1 \
 		--LittleEndian \
 		--architecture x86 \
-		-o test/test0102/proof || exit 7
+		-o test/test0102/proof \
+		|| exit 7
 
 	. ./sha256.sh
 	out=$(sha256_check test/test0102/proof.answer)
diff --git a/test/test1000/hello-aarch64.sh b/test/test1000/hello-aarch64.sh
index f89a918..656f60a 100755
--- a/test/test1000/hello-aarch64.sh
+++ b/test/test1000/hello-aarch64.sh
@@ -83,7 +83,8 @@ hex2 \
 if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "aarch64" ]
 then
 	# Verify that the resulting file works
-	./test/results/test1000-aarch64-binary --architecture x86 \
+	./test/results/test1000-aarch64-binary \
+		--architecture x86 \
 		-f test/common_x86/functions/file.c \
 		-f test/common_x86/functions/malloc.c \
 		-f functions/calloc.c \
@@ -104,7 +105,8 @@ then
 		-f cc_macro.c \
 		-f cc.c \
 		--bootstrap-mode \
-		-o test/test1000/proof || exit 5
+		-o test/test1000/proof \
+		|| exit 5
 
 	. ./sha256.sh
 	out=$(sha256_check test/test1000/proof.answer)
diff --git a/test/test1000/hello-amd64.sh b/test/test1000/hello-amd64.sh
index d0624d4..363d8f5 100755
--- a/test/test1000/hello-amd64.sh
+++ b/test/test1000/hello-amd64.sh
@@ -83,7 +83,8 @@ hex2 \
 if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "amd64" ]
 then
 	# Verify that the resulting file works
-	./test/results/test1000-amd64-binary --architecture x86 \
+	./test/results/test1000-amd64-binary \
+		--architecture x86 \
 		-f test/common_x86/functions/file.c \
 		-f test/common_x86/functions/malloc.c \
 		-f functions/calloc.c \
@@ -104,7 +105,8 @@ then
 		-f cc_macro.c \
 		-f cc.c \
 		--bootstrap-mode \
-		-o test/test1000/proof || exit 5
+		-o test/test1000/proof \
+		|| exit 5
 
 	. ./sha256.sh
 	out=$(sha256_check test/test1000/proof.answer)
diff --git a/test/test1000/hello-armv7l.sh b/test/test1000/hello-armv7l.sh
index 51099b8..437a534 100755
--- a/test/test1000/hello-armv7l.sh
+++ b/test/test1000/hello-armv7l.sh
@@ -82,7 +82,8 @@ hex2 \
 if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "armv7l" ]
 then
 	# Verify that the resulting file works
-	./test/results/test1000-armv7l-binary --architecture x86 \
+	./test/results/test1000-armv7l-binary \
+		--architecture x86 \
 		-f test/common_x86/functions/file.c \
 		-f test/common_x86/functions/malloc.c \
 		-f functions/calloc.c \
@@ -103,7 +104,8 @@ then
 		-f cc_macro.c \
 		-f cc.c \
 		--bootstrap-mode \
-		-o test/test1000/proof || exit 5
+		-o test/test1000/proof \
+		|| exit 5
 
 	. ./sha256.sh
 	out=$(sha256_check test/test1000/proof.answer)
diff --git a/test/test1000/hello-knight-posix.sh b/test/test1000/hello-knight-posix.sh
index 38e7338..27f7e65 100755
--- a/test/test1000/hello-knight-posix.sh
+++ b/test/test1000/hello-knight-posix.sh
@@ -74,7 +74,8 @@ hex2 \
 if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "knight*" ]
 then
 	# Verify that the resulting file works
-	./test/results/test1000-knight-posix-binary --architecture x86 \
+	./test/results/test1000-knight-posix-binary \
+		--architecture x86 \
 		-f test/common_x86/functions/file.c \
 		-f test/common_x86/functions/malloc.c \
 		-f functions/calloc.c \
@@ -95,7 +96,8 @@ then
 		-f cc_macro.c \
 		-f cc.c \
 		--bootstrap-mode \
-		-o test/test1000/proof || exit 4
+		-o test/test1000/proof \
+		|| exit 4
 
 	. ./sha256.sh
 	out=$(sha256_check test/test1000/proof.answer)
diff --git a/test/test1000/hello-x86.sh b/test/test1000/hello-x86.sh
index 55575e6..935b2c4 100755
--- a/test/test1000/hello-x86.sh
+++ b/test/test1000/hello-x86.sh
@@ -82,7 +82,8 @@ hex2 \
 if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "x86" ]
 then
 	# Verify that the resulting file works
-	./test/results/test1000-x86-binary --architecture x86 \
+	./test/results/test1000-x86-binary \
+		--architecture x86 \
 		-f test/common_x86/functions/file.c \
 		-f test/common_x86/functions/malloc.c \
 		-f functions/calloc.c \
@@ -103,7 +104,8 @@ then
 		-f cc_macro.c \
 		-f cc.c \
 		--bootstrap-mode \
-		-o test/test1000/proof || exit 5
+		-o test/test1000/proof \
+		|| exit 5
 
 	. ./sha256.sh
 	out=$(sha256_check test/test1000/proof.answer)