unit tests are fixed, pep8 rules are satisfied