more changes to Makefile for improved testing support