Pylint and test cleanup