Added re for handling underscore, and its test case.