Repaired CLI tests