Undo commented-out PEP8 tests

[n2ygk]

Some flake8 tests were commented-out/disabled (with --exit-zero) from tox.ini (see #749 for example). Restore these tests and fix the code that caused them to fail.