Simplify the 'operator<' for the attribute object.
Update testcases due to Attribute sorting improvements.