fixup pep8 test etc.