Changed some source files so that they will compile under Groovy 2.x
Fixed test case so that it works under Groovy 2.x
Test against Groovy 2.3 rc rather than beta.