Updated groovy and spock