Redid unit tests; not using Rspec now, since Rspec incompatible with Heroku