sped up some slow tests
pep8 cleanup