Test: CLI // Fixes