Changes for color coding flavors and test fixes.