Code

Updating tests for attributes now supported