Refactor color test