Fix tests.
Merge pull request #274 from afuna/fix-tests

Fix tests.