GRECLIPSE-1752 Fix & tests