Added the tox_wait functions