GROOVY-6546: fixed test cases