BUg 938695 - Fix failing tests, PEP-8