Test cases now verify both 32 and 64 bit binaries.

Defined a "scratch" register macro to use rax or eax, depending on the
architecture.