Remove black hole, update Makefile
Tweak output for running tests