EXPEDIA - Make tests more stable