UI: fix remaining tests broken by recent commits