added first_name/last_name when display_name does not exists - make the tests pass