Test fixes for restricting name_lister