Rolling back to Groovy 1.8 for tests to pass