GROOVY-6546: fixed test cases
Merge pull request #357 from andresteingress/master

GROOVY-6546: fixed test cases