diff --git a/test/test13/bbb/board.s b/test/test13/bbb/board.s
index 14ddda6..e6e2aed 100644
--- a/test/test13/bbb/board.s
+++ b/test/test13/bbb/board.s
@@ -1597,13 +1597,13 @@ _fen2board:
 	clr.b (a0)+
 	cmp.l d0,a0
 	jne .L294
-	lea _board+32364,a3
-	clr.l 28(a3)
-	clr.l 24(a3)
-	clr.l 4(a3)
-	clr.l (a3)
-	clr.l 20(a3)
-	clr.l 16(a3)
+	lea _board+32364,a0
+	clr.l 28(a0)
+	clr.l 24(a0)
+	clr.l 4(a0)
+	clr.l (a0)
+	clr.l 20(a0)
+	clr.l 16(a0)
 	sub.l a0,a0
 	moveq #7,d2
 	move.l #_psq_pawns,d3
diff --git a/test/test13/bbb/move.s b/test/test13/bbb/move.s
index 90c1726..cf512dd 100644
--- a/test/test13/bbb/move.s
+++ b/test/test13/bbb/move.s
@@ -234,7 +234,7 @@ _move_to_san:
 	move.l 60(sp),a0
 	move.l 56(sp),d3
 	add.l d3,d3
-	add.l 60(sp),d3
+	add.l 56(sp),d3
 	add.l d3,d3
 	add.l d3,d3
 	add.l a0,d3
diff --git a/test/test13/golden/board.s b/test/test13/golden/board.s
index 14ddda6..e6e2aed 100644
--- a/test/test13/golden/board.s
+++ b/test/test13/golden/board.s
@@ -1597,13 +1597,13 @@ _fen2board:
 	clr.b (a0)+
 	cmp.l d0,a0
 	jne .L294
-	lea _board+32364,a3
-	clr.l 28(a3)
-	clr.l 24(a3)
-	clr.l 4(a3)
-	clr.l (a3)
-	clr.l 20(a3)
-	clr.l 16(a3)
+	lea _board+32364,a0
+	clr.l 28(a0)
+	clr.l 24(a0)
+	clr.l 4(a0)
+	clr.l (a0)
+	clr.l 20(a0)
+	clr.l 16(a0)
 	sub.l a0,a0
 	moveq #7,d2
 	move.l #_psq_pawns,d3
diff --git a/test/test13/golden/move.s b/test/test13/golden/move.s
index 90c1726..cf512dd 100644
--- a/test/test13/golden/move.s
+++ b/test/test13/golden/move.s
@@ -234,7 +234,7 @@ _move_to_san:
 	move.l 60(sp),a0
 	move.l 56(sp),d3
 	add.l d3,d3
-	add.l 60(sp),d3
+	add.l 56(sp),d3
 	add.l d3,d3
 	add.l d3,d3
 	add.l a0,d3
diff --git a/test/test7/golden.s b/test/test7/golden.s
index 5dc77ef..ce65666 100755
--- a/test/test7/golden.s
+++ b/test/test7/golden.s
@@ -290,8 +290,8 @@ _level1_doorIntelligence:
 	move.w d3,d0
 	ext.l d0
 	jsr _object_collision
+	move.w d0,d4
 	addq.l #4,sp
-	tst.w d0
 	jeq .L51
 	tst.l 40(sp)
 	jeq .L52
@@ -508,8 +508,8 @@ _enemy_intelligence:
 	move.w d3,d0
 	ext.l d0
 	jsr _object_collision
+	move.w d0,d4
 	addq.l #4,sp
-	tst.w d0
 	jeq .L98
 	tst.l 40(sp)
 	jeq .L99
diff --git a/test/test7/test.s b/test/test7/test.s
index 5dc77ef..ce65666 100644
--- a/test/test7/test.s
+++ b/test/test7/test.s
@@ -290,8 +290,8 @@ _level1_doorIntelligence:
 	move.w d3,d0
 	ext.l d0
 	jsr _object_collision
+	move.w d0,d4
 	addq.l #4,sp
-	tst.w d0
 	jeq .L51
 	tst.l 40(sp)
 	jeq .L52
@@ -508,8 +508,8 @@ _enemy_intelligence:
 	move.w d3,d0
 	ext.l d0
 	jsr _object_collision
+	move.w d0,d4
 	addq.l #4,sp
-	tst.w d0
 	jeq .L98
 	tst.l 40(sp)
 	jeq .L99