Fix vanilla and tox tests
Merge pull request #1 from michaelmior/fix-tests

Fix vanilla and tox tests