UI: fix remaining broken tests