Improve color finder and add tests.