Fixed semantic highlighting bug & added highlighting unit tests.