Makefile wizardry

Summary:
Try to get `make test` to work on linux and mac (again).
Like most magic, just as liable to blow up in my own face as
to actually solve the problem.

Test plan: #yolo

Auditors: michelle