Reverted change for update_attributes; refactored specs for readability.