Rewrite highlight spec to use gold master testing, and fix a regression.