Full test coverage for models.py
Minor pylint cleanups