Updated tests to use objects instead of attributes