fix tests after 5135