updated tests
PEP8 over old code