fixes and tests for Color