Updated ColorSvc, tests