More tweaks to get travis to run properly with the current test suite (such as they are...)