Get rid of Code#highlighted
Fix tests