Tox tweaks

A few tweaks to the tox testing setup.