Updated tests
Merge pull request #34 from ankurankan/dev

Updated tests