imporved testing and pep8ify