Fixed few issues in Color test