Fixes for testing on Heroku