Add unit test and fix bugs under the test
Merge branch 'master' of https://github.com/tommas1988/tomments