Fix the test that's been failing on Travis

The problem was something to do with the project map being too
bare. Switching to `defproject` fixes it.
Merge remote-tracking branch 'upstream/master'