Merge pull request #328 from hynek/pep8-test_util

Make flake8 happy in test_util