R7_US02_General Bug fixing
Fixing buxs of commandline, add unittests