Fixes the UI smoke tests
Merge pull request #1756 from kbidarkar/fix-ui-smoke-tests

Fixes the UI smoke tests