Add support for *
Extra test