GRECLIPSE-1724

All tests are fixed