MRG: updates to Makefile targets and testing

Automated testing from the Makefile was broken; fix and add new testing
Makefile target.