Py3k: flake8'ifying
Py3k: Did not manage to fix CatchOutput.

Just regression testing the current failure in PY3 as OK and running the
full test on PY2