[refactor] some more Cmd refactoring + test fixes

parent 2ed7d1de
Pipeline #5243 passed with stages
in 57 minutes and 29 seconds