Add more tests
Merge pull request #4 from naoya/feature/addtests

Add more tests