Fix existing tests with changes for commands