Figure out what's happening on Heroku
Add more utility test coverage