Merge pull request #177 from leeyt/master

Add new testcases