Tests/PEP8 fixes