Simple test infrastructure
Comment out failing line
Spruce up Makefile