Fixed few failing tests
Merge pull request #1249 from sghai/fix-tests

Fixed few failing tests