More pylint
Pylint and (hopefully) Jenkins test fix.