reformat and fix command line
Merge branch 'full-test' into 0.7-rc-full-test