WIP - Try to fix Gaia UI test