WIP - fix UI test