Fixed various failing tests
Merge pull request #1201 from sghai/fix-test

Fixed various failing tests