Some small testing fixes to work on older copies of mock and pylint