Rework the Wildcard system, add unit test accordingly.