Include stricter checks where color will be replaced.

Also, increase test-examples.