More pylint fixes

A bunch of simple fixes to make unittests to run in older python versions.