pylint cleanup
fix tests