PEP-8
Fixed some tests.