Fix test errors
Merge pull request #61 from kyoshino/fix-tests

Fix test errors