groovy tests fixed