Feature/fix test and pep8