Fixed all tests.
Merge pull request #8 from lob/fix-test-suite

Fixed all tests.