refactoring MarkTokens and tests to properly support <emph>