Update tox setup, expand build matrix