Fix tests
Fix tests

Some of these had bad mocking and seemed to rely on the timeout to
pass. This fixes them and removes the timeout catch.

heroku/cli,heroku/heroku-cli,heroku/heroku-cli,heroku/heroku-cli,heroku/cli,heroku/cli,heroku/heroku-cli,heroku/cli