Do more work to setup tox and clean up requirements