add python3 support to setup.py for Python 3 listing on PyPI
fix tests to reflect variable name changes in previous commit