Fix Cmd tests
Merge branch 'cli-refactor' into migration