Fix tests broken by cli.py split

Some test modules made use of the fact that you can

  from module import x

working even if x is not listed in module.__all__.

Signed-off-by: Niklas Hambuechen <niklash@google.com>