Fixed groovy tests after deleting deprecated code