Tests

Merge this and push to heroku asap - it should fix the bugs...