Make testsuite pass with Groovy 2.x