Makefile changes for heartbeat tests