add v2.1 changes, and item attribute tests