Display indexes as their attribute name
Update tests