More robust UI tests