Pylint fixes, passing unit tests