Unittest fix
More pylint compliance