Syntax highlighting updates, add a test for it