Fixing the autotest failures + pylint clean-up.