improved spec
Merge branch 'groovy-1.8' into groovy-1.9