Fix tests.
Merge pull request #4 from ulfl/fix-tests

Fix tests.