Merge "Remove irrelevant groovy class that tests nothing"