fix tests
Merge pull request #74 from nickdesaulniers/master