More refactoring.  test_cpu includes cpu.c for access to internal functions.