Fix pep8 issues
Resolve "Test fails on Python 2.6"