fixes + tests
passed through pylint