further improve cli tests