fixed UI test failures
Merge pull request #1295 from sghai/fixes

fixed UI test failures