Fix property name highlighting

Prepare unit test for highlight feature.