Updated to latest tox core