Fix CliTest