Add Makefile to run tests; remove commented out code