lint: rudimentary cleanups in tests.support.
lint: test_cli.py