Fix a test and prep for Travis-CI