Fix tests on Travis
Merge pull request #156 from juliandunn/fix-travis-tests

Fix tests on Travis