Fix PEP8 and tests.