Fixing failing tests

...and had latest autopep8 run on the tests.