GRECLIPSE-1773 Fix and test
GRECLIPSE-1773 Fix for broken tests