Fix some tests, and don't have Travis run the ones that require a 'vagrant up'.