Greclipse 1798 & 1545 Fix and tests