fixed color handling + tests