Refactor UI tests to be simpler
Merge pull request #1690 from steventlamb/topic/refactor_ui_tests

Refactor UI tests to be simpler