Add UnderscoresAndPunctuation test and add punctuation processing