Fixed cli tests