Removed deprecated color class. Increased test coverage.