Fix test
Fix PEP8 issues