diff --git a/Makefile.am b/Makefile.am
index a37f89e9..ddcf05af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,8 +92,8 @@ LOG_DRIVER = testcpu  ## hack TODO/FIXME ... should be wrapper shell script acce
 A2_TEST_SOURCES = $(apple2ix_SOURCES) src/test/testcommon.c
 A2_TEST_CFLAGS = -DTESTING=1 -DCPU_TRACING=1 -DDISK_TRACING=1 -DVM_TRACING=1 -Isrc/test
 
-TESTS          = testcpu testdisplay testvm testdisk
-check_PROGRAMS = testcpu testdisplay testvm testdisk
+TESTS          = testcpu testdisplay testvm testdisk testtrace
+check_PROGRAMS = testcpu testdisplay testvm testdisk testtrace
 
 testcpu_SOURCES = src/test/testcpu.c $(A2_TEST_SOURCES) $(META_SRC)
 testcpu_CFLAGS = $(apple2ix_CFLAGS) $(A2_TEST_CFLAGS) -UAUDIO_ENABLED -UINTERFACE_CLASSIC
@@ -133,6 +133,16 @@ testdisk_DEPENDENCIES = @TESTDISK_ASM_O@ @META_O@ @VIDEO_O@
 
 EXTRA_testdisk_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC)
 
+testtrace_SOURCES = src/test/testtrace.c $(A2_TEST_SOURCES) $(META_SRC)
+testtrace_CFLAGS = $(apple2ix_CFLAGS) $(A2_TEST_CFLAGS) -UAUDIO_ENABLED -UINTERFACE_CLASSIC
+testtrace_CCASFLAGS = $(testtrace_CFLAGS)
+testtrace_LDFLAGS = $(apple2ix_LDFLAGS)
+# HACK FIXME TODO NOTE: specify testtrace_ASM_O to force it to rebuild with proper CCASFLAGS ... automake bug?
+testtrace_LDADD = @TESTTRACE_ASM_O@ @VIDEO_O@
+testtrace_DEPENDENCIES = @TESTTRACE_ASM_O@ @META_O@ @VIDEO_O@
+
+EXTRA_testtrace_SOURCES = $(ASM_SRC_x86) $(VIDEO_SRC)
+
 ###############################################################################
 # Misc & Installation
 
diff --git a/configure.ac b/configure.ac
index 5564670f..0b2d1320 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,7 @@ dnl Arch checks
 ASM_O="src/x86/glue.o src/x86/cpu.o"
 TESTVM_ASM_O="src/x86/testvm-glue.o src/x86/testvm-cpu.o"
 TESTDISK_ASM_O="src/x86/testdisk-glue.o src/x86/testdisk-cpu.o"
+TESTTRACE_ASM_O="src/x86/testtrace-glue.o src/x86/testtrace-cpu.o"
 arch=''
 case $target in
     x86_64-*-*)
@@ -77,6 +78,7 @@ fi
 AC_SUBST(ASM_O)
 AC_SUBST(TESTVM_ASM_O)
 AC_SUBST(TESTDISK_ASM_O)
+AC_SUBST(TESTTRACE_ASM_O)
 AC_SUBST([AM_CFLAGS])
 
 
diff --git a/src/test/testcommon.h b/src/test/testcommon.h
index f15b1307..ef2bf962 100644
--- a/src/test/testcommon.h
+++ b/src/test/testcommon.h
@@ -23,6 +23,12 @@
 #   include "test/sha1.h"
 #endif
 
+#ifdef ANDROID
+#   define HOMEDIR data_dir
+#else
+#   define HOMEDIR getenv("HOME")
+#endif
+
 #define TEST_FINISHED 0xff
 #define MIXSWITCH_ADDR 0x1f32   // PEEK(7986) -- NOTE : value is hardcoded in various places
 #define WATCHPOINT_ADDR 0x1f33  // PEEK(7987) -- NOTE : value is hardcoded in various places
diff --git a/src/test/testdisk.c b/src/test/testdisk.c
index 1fb48b55..a062878e 100644
--- a/src/test/testdisk.c
+++ b/src/test/testdisk.c
@@ -11,15 +11,6 @@
 
 #include "testcommon.h"
 
-#ifdef ANDROID
-#   define HOMEDIR data_dir
-#else
-#   define HOMEDIR getenv("HOME")
-#endif
-
-#define ABUSIVE_TESTS 0
-#define FINICKY_TESTS 0
-
 #define TESTING_DISK "testvm1.dsk.gz"
 #define BLANK_DSK "blank.dsk.gz"
 #define BLANK_NIB "blank.nib.gz"
@@ -190,346 +181,6 @@ TEST test_boot_disk_bytes_po() {
     PASS();
 }
 
-// This test is majorly abusive ... it creates an ~800MB file in $HOME
-// ... but if it's correct, you're fairly assured the cpu/vm is working =)
-#if ABUSIVE_TESTS
-#define EXPECTED_CPU_TRACE_FILE_SIZE 809430487
-#define EXPECTED_CPU_TRACE_SHA "4DB0C2547A0F02450A0E5E663C5BE8EA776C7A41"
-TEST test_boot_disk_cputrace() {
-    const char *homedir = HOMEDIR;
-    char *output = NULL;
-    asprintf(&output, "%s/a2_cputrace.txt", homedir);
-    if (output) {
-        unlink(output);
-        cpu65_trace_begin(output);
-    }
-
-    srandom(0);
-    BOOT_TO_DOS();
-
-    cpu65_trace_end();
-    c_eject_6(0);
-
-    do {
-        uint8_t md[SHA_DIGEST_LENGTH];
-        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
-
-        FILE *fp = fopen(output, "r");
-        fseek(fp, 0, SEEK_END);
-        long expectedSize = ftell(fp);
-        ASSERT(expectedSize == EXPECTED_CPU_TRACE_FILE_SIZE);
-        fseek(fp, 0, SEEK_SET);
-        unsigned char *buf = malloc(EXPECTED_CPU_TRACE_FILE_SIZE);
-        if (fread(buf, 1, EXPECTED_CPU_TRACE_FILE_SIZE, fp) != EXPECTED_CPU_TRACE_FILE_SIZE) {
-            ASSERT(false);
-        }
-        fclose(fp); fp = NULL;
-        SHA1(buf, EXPECTED_CPU_TRACE_FILE_SIZE, md);
-        FREE(buf);
-
-        sha1_to_str(md, mdstr0);
-        ASSERT(strcmp(mdstr0, EXPECTED_CPU_TRACE_SHA) == 0);
-    } while(0);
-
-    unlink(output);
-    FREE(output);
-
-    PASS();
-}
-#endif
-
-#define EXPECTED_CPUTRACE_HELLO_FILE_SIZE 118664420
-#define EXPECTED_CPUTRACE_HELLO_SHA "C01DDA6AE63A2FEA0CE8DA3A3B258F96AE8BA79B"
-TEST test_cputrace_hello_dsk() {
-    test_setup_boot_disk(BLANK_DSK, 0);
-
-    BOOT_TO_DOS();
-
-    const char *homedir = HOMEDIR;
-    char *output = NULL;
-    asprintf(&output, "%s/a2_cputrace_hello_dsk.txt", homedir);
-    if (output) {
-        unlink(output);
-        cpu65_trace_begin(output);
-    }
-
-    srandom(0);
-    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
-    test_type_input("RUN HELLO\r");
-    c_debugger_go();
-
-    cpu65_trace_end();
-    c_eject_6(0);
-
-    do {
-        uint8_t md[SHA_DIGEST_LENGTH];
-        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
-
-        FILE *fp = fopen(output, "r");
-        fseek(fp, 0, SEEK_END);
-        long expectedSize = ftell(fp);
-        ASSERT(expectedSize == EXPECTED_CPUTRACE_HELLO_FILE_SIZE);
-        fseek(fp, 0, SEEK_SET);
-        unsigned char *buf = malloc(EXPECTED_CPUTRACE_HELLO_FILE_SIZE);
-        if (fread(buf, 1, EXPECTED_CPUTRACE_HELLO_FILE_SIZE, fp) != EXPECTED_CPUTRACE_HELLO_FILE_SIZE) {
-            ASSERT(false);
-        }
-        fclose(fp); fp = NULL;
-        SHA1(buf, EXPECTED_CPUTRACE_HELLO_FILE_SIZE, md);
-        FREE(buf);
-
-        sha1_to_str(md, mdstr0);
-        ASSERT(strcmp(mdstr0, EXPECTED_CPUTRACE_HELLO_SHA) == 0);
-    } while(0);
-
-    unlink(output);
-    FREE(output);
-
-    PASS();
-}
-
-#define EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE 14612543
-#define EXPECTED_CPUTRACE_HELLO_NIB_SHA "2D494B4302CC6E3753D7AB50B587C03C7E05C93A"
-TEST test_cputrace_hello_nib() {
-    test_setup_boot_disk(BLANK_NIB, 0);
-
-    BOOT_TO_DOS();
-
-    const char *homedir = HOMEDIR;
-    char *output = NULL;
-    asprintf(&output, "%s/a2_cputrace_hello_nib.txt", homedir);
-    if (output) {
-        unlink(output);
-        cpu65_trace_begin(output);
-    }
-
-    srandom(0);
-    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
-    test_type_input("RUN HELLO\r");
-    c_debugger_go();
-
-    cpu65_trace_end();
-    c_eject_6(0);
-
-    do {
-        uint8_t md[SHA_DIGEST_LENGTH];
-        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
-
-        FILE *fp = fopen(output, "r");
-        fseek(fp, 0, SEEK_END);
-        long expectedSize = ftell(fp);
-        ASSERT(expectedSize == EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE);
-        fseek(fp, 0, SEEK_SET);
-        unsigned char *buf = malloc(EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE);
-        if (fread(buf, 1, EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE, fp) != EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE) {
-            ASSERT(false);
-        }
-        fclose(fp); fp = NULL;
-        SHA1(buf, EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE, md);
-        FREE(buf);
-
-        sha1_to_str(md, mdstr0);
-        ASSERT(strcmp(mdstr0, EXPECTED_CPUTRACE_HELLO_NIB_SHA) == 0);
-    } while(0);
-
-    unlink(output);
-    FREE(output);
-
-    PASS();
-}
-
-#define EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE 118680586
-#define EXPECTED_CPUTRACE_HELLO_PO_SHA "716D8D515876C138B7F3D8F078F05684C801D707"
-TEST test_cputrace_hello_po() {
-    test_setup_boot_disk(BLANK_PO, 0);
-
-    BOOT_TO_DOS();
-
-    const char *homedir = HOMEDIR;
-    char *output = NULL;
-    asprintf(&output, "%s/a2_cputrace_hello_po.txt", homedir);
-    if (output) {
-        unlink(output);
-        cpu65_trace_begin(output);
-    }
-
-    srandom(0);
-    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
-    test_type_input("RUN HELLO\r");
-    c_debugger_go();
-
-    cpu65_trace_end();
-    c_eject_6(0);
-
-    do {
-        uint8_t md[SHA_DIGEST_LENGTH];
-        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
-
-        FILE *fp = fopen(output, "r");
-        fseek(fp, 0, SEEK_END);
-        long expectedSize = ftell(fp);
-        ASSERT(expectedSize == EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE);
-        fseek(fp, 0, SEEK_SET);
-        unsigned char *buf = malloc(EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE);
-        if (fread(buf, 1, EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE, fp) != EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE) {
-            ASSERT(false);
-        }
-        fclose(fp); fp = NULL;
-        SHA1(buf, EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE, md);
-        FREE(buf);
-
-        sha1_to_str(md, mdstr0);
-        ASSERT(strcmp(mdstr0, EXPECTED_CPUTRACE_HELLO_PO_SHA) == 0);
-    } while(0);
-
-    unlink(output);
-    FREE(output);
-
-    PASS();
-}
-
-#define EXPECTED_VM_TRACE_FILE_SIZE 2830792
-#define EXPECTED_VM_TRACE_SHA "E3AA4EBEACF9053D619E115F6AEB454A8939BFB4"
-TEST test_boot_disk_vmtrace() {
-    const char *homedir = HOMEDIR;
-    char *disk = NULL;
-    asprintf(&disk, "%s/a2_vmtrace.txt", homedir);
-    if (disk) {
-        unlink(disk);
-        vm_trace_begin(disk);
-    }
-
-    srandom(0);
-    BOOT_TO_DOS();
-
-    vm_trace_end();
-    c_eject_6(0);
-
-    do {
-        uint8_t md[SHA_DIGEST_LENGTH];
-        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
-
-        FILE *fp = fopen(disk, "r");
-
-        fseek(fp, 0, SEEK_END);
-        long expectedSize = ftell(fp);
-        ASSERT(expectedSize == EXPECTED_VM_TRACE_FILE_SIZE);
-        fseek(fp, 0, SEEK_SET);
-
-        unsigned char *buf = malloc(EXPECTED_VM_TRACE_FILE_SIZE);
-        if (fread(buf, 1, EXPECTED_VM_TRACE_FILE_SIZE, fp) != EXPECTED_VM_TRACE_FILE_SIZE) {
-            ASSERT(false);
-        }
-        fclose(fp); fp = NULL;
-        SHA1(buf, EXPECTED_VM_TRACE_FILE_SIZE, md);
-        FREE(buf);
-
-        sha1_to_str(md, mdstr0);
-        ASSERT(strcmp(mdstr0, EXPECTED_VM_TRACE_SHA) == 0);
-    } while(0);
-
-    unlink(disk);
-    FREE(disk);
-
-    PASS();
-}
-
-#define EXPECTED_VM_TRACE_NIB_FILE_SIZE 2930056
-#define EXPECTED_VM_TRACE_NIB_SHA "D60DAE2F3AA4002678457F6D16FC8A25FA14C10E"
-TEST test_boot_disk_vmtrace_nib() {
-    test_setup_boot_disk(BLANK_NIB, 0);
-
-    const char *homedir = HOMEDIR;
-    char *disk = NULL;
-    asprintf(&disk, "%s/a2_vmtrace_nib.txt", homedir);
-    if (disk) {
-        unlink(disk);
-        vm_trace_begin(disk);
-    }
-
-    srandom(0);
-    BOOT_TO_DOS();
-
-    vm_trace_end();
-    c_eject_6(0);
-
-    do {
-        uint8_t md[SHA_DIGEST_LENGTH];
-        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
-
-        FILE *fp = fopen(disk, "r");
-
-        fseek(fp, 0, SEEK_END);
-        long expectedSize = ftell(fp);
-        ASSERT(expectedSize == EXPECTED_VM_TRACE_NIB_FILE_SIZE);
-        fseek(fp, 0, SEEK_SET);
-
-        unsigned char *buf = malloc(EXPECTED_VM_TRACE_NIB_FILE_SIZE);
-        if (fread(buf, 1, EXPECTED_VM_TRACE_NIB_FILE_SIZE, fp) != EXPECTED_VM_TRACE_NIB_FILE_SIZE) {
-            ASSERT(false);
-        }
-        fclose(fp); fp = NULL;
-        SHA1(buf, EXPECTED_VM_TRACE_NIB_FILE_SIZE, md);
-        FREE(buf);
-
-        sha1_to_str(md, mdstr0);
-        ASSERT(strcmp(mdstr0, EXPECTED_VM_TRACE_NIB_SHA) == 0);
-    } while(0);
-
-    unlink(disk);
-    FREE(disk);
-
-    PASS();
-}
-
-#define EXPECTED_VM_TRACE_PO_FILE_SIZE EXPECTED_VM_TRACE_FILE_SIZE
-#define EXPECTED_VM_TRACE_PO_SHA "DA200BE91FD8D6D09E551A19ED0445F985898C16"
-TEST test_boot_disk_vmtrace_po() {
-    test_setup_boot_disk(BLANK_PO, 0);
-
-    const char *homedir = HOMEDIR;
-    char *disk = NULL;
-    asprintf(&disk, "%s/a2_vmtrace_po.txt", homedir);
-    if (disk) {
-        unlink(disk);
-        vm_trace_begin(disk);
-    }
-
-    srandom(0);
-    BOOT_TO_DOS();
-
-    vm_trace_end();
-    c_eject_6(0);
-
-    do {
-        uint8_t md[SHA_DIGEST_LENGTH];
-        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
-
-        FILE *fp = fopen(disk, "r");
-
-        fseek(fp, 0, SEEK_END);
-        long expectedSize = ftell(fp);
-        ASSERT(expectedSize == EXPECTED_VM_TRACE_PO_FILE_SIZE);
-        fseek(fp, 0, SEEK_SET);
-
-        unsigned char *buf = malloc(EXPECTED_VM_TRACE_PO_FILE_SIZE);
-        if (fread(buf, 1, EXPECTED_VM_TRACE_PO_FILE_SIZE, fp) != EXPECTED_VM_TRACE_PO_FILE_SIZE) {
-            ASSERT(false);
-        }
-        fclose(fp); fp = NULL;
-        SHA1(buf, EXPECTED_VM_TRACE_PO_FILE_SIZE, md);
-        FREE(buf);
-
-        sha1_to_str(md, mdstr0);
-        ASSERT(strcmp(mdstr0, EXPECTED_VM_TRACE_PO_SHA) == 0);
-    } while(0);
-
-    unlink(disk);
-    FREE(disk);
-
-    PASS();
-}
-
 TEST test_boot_disk() {
     BOOT_TO_DOS();
     PASS();
@@ -1040,19 +691,6 @@ GREATEST_SUITE(test_suite_disk) {
     RUN_TESTp(test_boot_disk_bytes_nib);
     RUN_TESTp(test_boot_disk_bytes_po);
 
-#if ABUSIVE_TESTS
-    RUN_TESTp(test_boot_disk_cputrace);
-#endif
-
-#if FINICKY_TESTS
-    RUN_TESTp(test_cputrace_hello_dsk);
-    RUN_TESTp(test_cputrace_hello_nib);
-    RUN_TESTp(test_cputrace_hello_po);
-    RUN_TESTp(test_boot_disk_vmtrace);
-    RUN_TESTp(test_boot_disk_vmtrace_nib);
-    RUN_TESTp(test_boot_disk_vmtrace_po);
-#endif
-
     RUN_TESTp(test_boot_disk);
 
     RUN_TESTp(test_read_null_bytes);
diff --git a/src/test/testtrace.c b/src/test/testtrace.c
new file mode 100644
index 00000000..7b385a1e
--- /dev/null
+++ b/src/test/testtrace.c
@@ -0,0 +1,452 @@
+/*
+ * Apple // emulator for *nix
+ *
+ * This software package is subject to the GNU General Public License
+ * version 2 or later (your choice) as published by the Free Software
+ * Foundation.
+ *
+ * THERE ARE NO WARRANTIES WHATSOEVER.
+ *
+ */
+
+#include "testcommon.h"
+
+#define ABUSIVE_TESTS 1
+#define FINICKY_TESTS 1
+
+#define TESTING_DISK "testvm1.dsk.gz"
+#define BLANK_DSK "blank.dsk.gz"
+#define BLANK_NIB "blank.nib.gz"
+#define BLANK_PO  "blank.po.gz"
+
+static bool test_thread_running = false;
+
+extern pthread_mutex_t interface_mutex; // TODO FIXME : raw access to CPU mutex because stepping debugger ...
+
+static void testtrace_setup(void *arg) {
+    test_common_setup();
+    apple_ii_64k[0][MIXSWITCH_ADDR] = 0x00;
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
+    apple_ii_64k[0][TESTOUT_ADDR] = 0x00;
+    joy_button0 = 0xff; // OpenApple
+    test_setup_boot_disk(TESTING_DISK, 1);
+    if (test_do_reboot) {
+        cpu65_interrupt(ResetSig);
+    }
+}
+
+static void testtrace_teardown(void *arg) {
+}
+
+// ----------------------------------------------------------------------------
+// Disk TESTS ...
+
+// This test is majorly abusive ... it creates an ~800MB file in $HOME
+// ... but if it's correct, you're fairly assured the cpu/vm is working =)
+#if ABUSIVE_TESTS
+#define EXPECTED_CPU_TRACE_FILE_SIZE 809430487
+#define EXPECTED_CPU_TRACE_SHA "4DB0C2547A0F02450A0E5E663C5BE8EA776C7A41"
+TEST test_boot_disk_cputrace() {
+    const char *homedir = HOMEDIR;
+    char *output = NULL;
+    asprintf(&output, "%s/a2_cputrace.txt", homedir);
+    if (output) {
+        unlink(output);
+        cpu65_trace_begin(output);
+    }
+
+    srandom(0);
+    BOOT_TO_DOS();
+
+    cpu65_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(output, "r");
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_CPU_TRACE_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+        unsigned char *buf = malloc(EXPECTED_CPU_TRACE_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_CPU_TRACE_FILE_SIZE, fp) != EXPECTED_CPU_TRACE_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_CPU_TRACE_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_CPU_TRACE_SHA) == 0);
+    } while(0);
+
+    unlink(output);
+    FREE(output);
+
+    PASS();
+}
+#endif
+
+#define EXPECTED_CPUTRACE_HELLO_FILE_SIZE 118664420
+#define EXPECTED_CPUTRACE_HELLO_SHA "C01DDA6AE63A2FEA0CE8DA3A3B258F96AE8BA79B"
+TEST test_cputrace_hello_dsk() {
+    test_setup_boot_disk(BLANK_DSK, 0);
+
+    BOOT_TO_DOS();
+
+    const char *homedir = HOMEDIR;
+    char *output = NULL;
+    asprintf(&output, "%s/a2_cputrace_hello_dsk.txt", homedir);
+    if (output) {
+        unlink(output);
+        cpu65_trace_begin(output);
+    }
+
+    srandom(0);
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
+    test_type_input("RUN HELLO\r");
+    c_debugger_go();
+
+    cpu65_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(output, "r");
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_CPUTRACE_HELLO_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+        unsigned char *buf = malloc(EXPECTED_CPUTRACE_HELLO_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_CPUTRACE_HELLO_FILE_SIZE, fp) != EXPECTED_CPUTRACE_HELLO_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_CPUTRACE_HELLO_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_CPUTRACE_HELLO_SHA) == 0);
+    } while(0);
+
+    unlink(output);
+    FREE(output);
+
+    PASS();
+}
+
+#define EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE 14612543
+#define EXPECTED_CPUTRACE_HELLO_NIB_SHA "2D494B4302CC6E3753D7AB50B587C03C7E05C93A"
+TEST test_cputrace_hello_nib() {
+    test_setup_boot_disk(BLANK_NIB, 0);
+
+    BOOT_TO_DOS();
+
+    const char *homedir = HOMEDIR;
+    char *output = NULL;
+    asprintf(&output, "%s/a2_cputrace_hello_nib.txt", homedir);
+    if (output) {
+        unlink(output);
+        cpu65_trace_begin(output);
+    }
+
+    srandom(0);
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
+    test_type_input("RUN HELLO\r");
+    c_debugger_go();
+
+    cpu65_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(output, "r");
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+        unsigned char *buf = malloc(EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE, fp) != EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_CPUTRACE_HELLO_NIB_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_CPUTRACE_HELLO_NIB_SHA) == 0);
+    } while(0);
+
+    unlink(output);
+    FREE(output);
+
+    PASS();
+}
+
+#define EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE 118680586
+#define EXPECTED_CPUTRACE_HELLO_PO_SHA "716D8D515876C138B7F3D8F078F05684C801D707"
+TEST test_cputrace_hello_po() {
+    test_setup_boot_disk(BLANK_PO, 0);
+
+    BOOT_TO_DOS();
+
+    const char *homedir = HOMEDIR;
+    char *output = NULL;
+    asprintf(&output, "%s/a2_cputrace_hello_po.txt", homedir);
+    if (output) {
+        unlink(output);
+        cpu65_trace_begin(output);
+    }
+
+    srandom(0);
+    apple_ii_64k[0][WATCHPOINT_ADDR] = 0x00;
+    test_type_input("RUN HELLO\r");
+    c_debugger_go();
+
+    cpu65_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(output, "r");
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+        unsigned char *buf = malloc(EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE, fp) != EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_CPUTRACE_HELLO_PO_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_CPUTRACE_HELLO_PO_SHA) == 0);
+    } while(0);
+
+    unlink(output);
+    FREE(output);
+
+    PASS();
+}
+
+#define EXPECTED_VM_TRACE_FILE_SIZE 2830792
+#define EXPECTED_VM_TRACE_SHA "E3AA4EBEACF9053D619E115F6AEB454A8939BFB4"
+TEST test_boot_disk_vmtrace() {
+    const char *homedir = HOMEDIR;
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_vmtrace.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        vm_trace_begin(disk);
+    }
+
+    srandom(0);
+    BOOT_TO_DOS();
+
+    vm_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_VM_TRACE_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_VM_TRACE_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_VM_TRACE_FILE_SIZE, fp) != EXPECTED_VM_TRACE_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_VM_TRACE_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_VM_TRACE_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    PASS();
+}
+
+#define EXPECTED_VM_TRACE_NIB_FILE_SIZE 2930056
+#define EXPECTED_VM_TRACE_NIB_SHA "D60DAE2F3AA4002678457F6D16FC8A25FA14C10E"
+TEST test_boot_disk_vmtrace_nib() {
+    test_setup_boot_disk(BLANK_NIB, 0);
+
+    const char *homedir = HOMEDIR;
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_vmtrace_nib.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        vm_trace_begin(disk);
+    }
+
+    srandom(0);
+    BOOT_TO_DOS();
+
+    vm_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_VM_TRACE_NIB_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_VM_TRACE_NIB_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_VM_TRACE_NIB_FILE_SIZE, fp) != EXPECTED_VM_TRACE_NIB_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_VM_TRACE_NIB_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_VM_TRACE_NIB_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    PASS();
+}
+
+#define EXPECTED_VM_TRACE_PO_FILE_SIZE EXPECTED_VM_TRACE_FILE_SIZE
+#define EXPECTED_VM_TRACE_PO_SHA "DA200BE91FD8D6D09E551A19ED0445F985898C16"
+TEST test_boot_disk_vmtrace_po() {
+    test_setup_boot_disk(BLANK_PO, 0);
+
+    const char *homedir = HOMEDIR;
+    char *disk = NULL;
+    asprintf(&disk, "%s/a2_vmtrace_po.txt", homedir);
+    if (disk) {
+        unlink(disk);
+        vm_trace_begin(disk);
+    }
+
+    srandom(0);
+    BOOT_TO_DOS();
+
+    vm_trace_end();
+    c_eject_6(0);
+
+    do {
+        uint8_t md[SHA_DIGEST_LENGTH];
+        char mdstr0[(SHA_DIGEST_LENGTH*2)+1];
+
+        FILE *fp = fopen(disk, "r");
+
+        fseek(fp, 0, SEEK_END);
+        long expectedSize = ftell(fp);
+        ASSERT(expectedSize == EXPECTED_VM_TRACE_PO_FILE_SIZE);
+        fseek(fp, 0, SEEK_SET);
+
+        unsigned char *buf = malloc(EXPECTED_VM_TRACE_PO_FILE_SIZE);
+        if (fread(buf, 1, EXPECTED_VM_TRACE_PO_FILE_SIZE, fp) != EXPECTED_VM_TRACE_PO_FILE_SIZE) {
+            ASSERT(false);
+        }
+        fclose(fp); fp = NULL;
+        SHA1(buf, EXPECTED_VM_TRACE_PO_FILE_SIZE, md);
+        FREE(buf);
+
+        sha1_to_str(md, mdstr0);
+        ASSERT(strcmp(mdstr0, EXPECTED_VM_TRACE_PO_SHA) == 0);
+    } while(0);
+
+    unlink(disk);
+    FREE(disk);
+
+    PASS();
+}
+
+// ----------------------------------------------------------------------------
+// Test Suite
+
+GREATEST_SUITE(test_suite_trace) {
+    pthread_mutex_lock(&interface_mutex);
+
+    GREATEST_SET_SETUP_CB(testtrace_setup, NULL);
+    GREATEST_SET_TEARDOWN_CB(testtrace_teardown, NULL);
+    GREATEST_SET_BREAKPOINT_CB(test_breakpoint, NULL);
+
+    // TESTS --------------------------
+    test_thread_running = true;
+
+#if ABUSIVE_TESTS
+    RUN_TESTp(test_boot_disk_cputrace);
+#endif
+
+#if FINICKY_TESTS
+    RUN_TESTp(test_cputrace_hello_dsk);
+    RUN_TESTp(test_cputrace_hello_nib);
+    RUN_TESTp(test_cputrace_hello_po);
+    RUN_TESTp(test_boot_disk_vmtrace);
+    RUN_TESTp(test_boot_disk_vmtrace_nib);
+    RUN_TESTp(test_boot_disk_vmtrace_po);
+#endif
+
+    // ...
+    c_eject_6(0);
+    pthread_mutex_unlock(&interface_mutex);
+}
+
+SUITE(test_suite_trace);
+GREATEST_MAIN_DEFS();
+
+static char **test_argv = NULL;
+static int test_argc = 0;
+
+static void *test_thread(void *dummyptr) {
+    int argc = test_argc;
+    char **argv = test_argv;
+    GREATEST_MAIN_BEGIN();
+    RUN_SUITE(test_suite_trace);
+    GREATEST_MAIN_END();
+    return NULL;
+}
+
+void test_trace(int argc, char **argv) {
+    test_argc = argc;
+    test_argv = argv;
+
+    test_common_init();
+
+    pthread_t p;
+    pthread_create(&p, NULL, (void *)&test_thread, (void *)NULL);
+
+    while (!test_thread_running) {
+        struct timespec ts = { .tv_sec=0, .tv_nsec=33333333 };
+        nanosleep(&ts, NULL);
+    }
+    timing_startCPU();
+    video_main_loop();
+    //pthread_join(p, NULL);
+}
+
+#if !defined(__APPLE__)
+int main(int argc, char **argv) {
+    test_trace(argc, argv);
+}
+#endif