Fixed failing tests after cleanup of find_user