Fix tests
fix pep8