Fix cpanel test
PEP8 misc