Test with grunt-mocha-test instead of Makefile
Teach grunt to put files in the appropriate directories