[1200] pep8 and test failure fixups