Fix color tests for refactor