Even more improved UI tests