Improved compatibility with pep8
Improved compatibility with pep8; Fixed one test