Changes and tests for hashtag stripping