Fix some PEP8 violations to make tests pass