replacing test framework
made a few changes to get everything working on heroku