fix pylint errors

Also removed some testutils code that must have been dead because it had
rotten.
5 files changed