Update integration tests for new highlighter again

This time it grew the ability to filter down to matching phrases so we
reflect that.

Change-Id: I3bd4e443b2c70e0cdeb242feed58aa170939ec82