Fix tests
Merge pull request #118 from heroku/pedro-fix-tests

Fix tests