Improves coverage and fixes pylint violations.