In this patch, most notable changes are: - use python3 exclusively for tox - fix up broken tests - a couple of style issues fixes here and there