Updated syntax highlighting and added tests for it