Fix failing tests.
Merge pull request #35 from jericks/fix_tests

Fix failing tests.