Fixed tests that failed after upgrading to Groovy 2.3.2