Made theharvester test more generic.