Issue #3281430 by Spokje, deviantintegral, lauriii: Update non-migration Color...
Issue #3281430 by Spokje, deviantintegral, lauriii: Update non-migration Color tests to not use Bartik
(cherry picked from commit 8d989075)
(cherry picked from commit 861205ad)