Update various command shell such format output, fix broken test
Update various command shell such format output, fix broken test