fix pep8
fix tests