change command line spec. rename and fix testcase