Fix test errors after popit-resolver changes