Renamed macro wrapping attribute to a more descriptive name.
Adapted test cases for adapt_assoc_tpl_struct with type deduction.