cleanup Completion test lib
sorted subcommands after long version of subcommand