Added color convert & tests