Removed test, plus commits from @kalectro on groovy_dev branch