Fixes for pep8 and final test failures