Fixed the tests.
Merge pull request #5 from ajorians/FixTests

Fixed the tests.