Added six.py to glue.external
Fix a large fraction of tests in Python 3.x
More fixes to tests for Python 3.x