Misc lint driven fixups
Misc changes to [a] make Tox work and [b] resolve issues in test raised by trying to run them against Python 3.x