Change default waitStrategy in Environment to Yielding