-C command line option was not recognized

regression from earlier today
testbench: replace legacy option
testbench: fix recent regresssions
Merge remote-tracking branch 'github/master-candidate' into master-candidate