fix pep8 and more tests