GRECLIPSE-1788
Minor test modifications