GRECLIPSE-1751 Tests were added first
GRECLIPSE-1751 Fix and highlighting tests
Merge branch 'GRECLIPSE-1751'