fixed tests
Merge pull request #9 from Foxboron/test-fixes

Fixed tests as a result of last PR