Fixing pylint and tests