DRY up testing targets in Makefile a bit
Merge pull request #2238 from gittip/refactor-make-test

DRY up testing targets in Makefile a bit