Increased coverage, PEP8 fixes.