Slow tests and lost peeps on Heroku fixed