new test cases and bug fixes for wildcards and punctuation