GROOVY-6593 Lessened the impage on groovy.g and more tests