Updated attribute name
Updated tests