Add underscore to regex and associated test