Merge pull request #1 from lqi/master

Use Hamcrest style in all test cases