cleaned up some groom tests