PEP8 fixes
Patch up a test