Improve PEP8 compliance
Improve PEP8 compliance
Update failing tests.