Fix tests
Merge pull request #121 from kuraga/patch-6

Fix some tests