fix up our test procedure
Merge pull request #238 from Yelp/make-test

Consolidate test command to make test.