Merge pull request #4 from MSOpenTech/master

Added more test cases for client