Hopefully final changes to heroku email test