Updated tests and removed attributes method testing