Added wait_until_ready to reduce flakiness