Improved groovy tests