Making expression parsing less lax to catch valid exception cases.

- Instead adding special cases for colors and well known mark names.
fixing test dependency