Fix some outstanding test failures
Adjust tox python versions