Merge pull request #3969 from clumens/minor-pychecks
Refactor: test: Fix a few very minor pylint complaints.