Minor repartitioningstresstest cleanup