Fixed: CLI tests