Repair duplicate flag in new CLI commands.
Repair tests.