Tests, getting ready for heroku