Discrete color scale improvements. Add a missing test.