Use .for_choices instead of .for_buffer in most tests, drop ir_type from ir_value_key

Use .for_choices instead of .for_buffer in most tests, drop ir_type from ir_value_key #4925