Added some more tests to cover more scenarios
Merge pull request #1 from namshi/more-tests

Added some more tests to cover more scenarios