Small test and PEP8 fixes.