Updated/Added groovy tests