GRECLIPSE-1773 Fix for broken tests