Synced to latest Tox API changes