fix 2 failed groovy-tests