Color fix for #819 and #821

This fix addresses test issues in Attribute

@sdesai