Fix Item#type tests.
More work on Color refactoring.