More highlighting and test fixes.