Updated attribute and added tests