All main tests passing in Python 2 & 3!
Last couple tweaks for Python 3 support