Add test suite
Merge branch 'master' into testing
Fix test
Merge pull request #5 from peco/testing

Add test suite