WIP on UI test API improvements