Update failing test, pep8 fixes.