Rewriting cli tests