Updates to help tests run better on heroku.