Syntax highlighting and unit test fixes.