Update TextHelper & unit tests