Fix Cmd tests