Updated to latest Tox