ui tests
Merge branch 'UI'
Revert "Merge branch 'UI'"

This reverts commit 36e7735e753a48d9ed207ed8935abf65092c3023, reversing
changes made to 0c57a90a71ea2556a07e1995ff794bc1fbe7cfc9.