Merge "Fix tests which use 'display_name' for both V1 and V2"