cpu_instr and instr_timing tests pass now