Merge "Use Remex for TextContentTest subclasses"