Fixing up vagrant setup and aliases for tests