Refactor tests
Remove heroku from tests as it breaks with py33