Fixed few more UI tests
Merge pull request #1216 from sghai/fix-test

Fixed few more UI tests