punctuation, tests

Fixed punctuation edge case issues, added test suite