Fixes all tests
Merge pull request #53 from taylorzr/fix-tests

Fixes all tests