Alphabetical header include. Minor trait test fix.
Alphabetical header include. Minor trait test fix.

che2/bde,che2/bde,che2/bde,bloomberg/bde,che2/bde,bloomberg/bde,bloomberg/bde,bloomberg/bde,bloomberg/bde