Surround Query Parser sometimes doesn't highlight

From TestSurroundQueryParser

"q", "{!surround df=name}k w l",
                "hl", "true",
                "hl.fl", "name", 
                "hl.usePhraseHighlighter", "false"

This won't work with the unified highlighter because when usePhraseHighlighter is disabled as seen above, it relies on Query.visitTerms to be implemented properly, which it isn't (a TODO in Lucene for that query).

Workaround is to not disable usePhraseHighlighter or to use the original highlighter.