Fix existing unit tests.
Merge pull request #24 from emtwo/unit-tests

Fix existing unit tests.