Improved wildcard tests and made handling of the new case more explicit