GRECLIPSE-1129 Fix and tests