Fixing more tests

This branch now has a clean Travis build! I'm mostly not responsible for it but no one else has made the pull request  yet.