Fix broken UI tests