Use the new avis cluster in test