Makefile test code handling; prep for dual interrupt code