Make pep8 tests pass