Fix failing unit tests, address Brian's feedback
Pylint