79318780 handle green trait

WIP: Please weigh in on this approach. Handling traits that come through as keys + a blank value. 

Also fixed a bad spec.