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

Fixed few UI tests