Fix broken unit test
Pep8 cleanup