Make tests more robust.