Add color tests, cosmetic cleanup