More tests and pylint cleanup