GRECLIPSE-1129 Additional test and fix