trying to fix tests
Merge branch 'master' of https://github.com/bsnyder/sushi