Fixed unit tests
Merge pull request #9 from lossyrob/testfix

Fixed unit tests