Correct mistake in logic about brief

 - make new unittests - all pass
 - correct mistakes in functional tests - all pass
 - delete empty line in test file cli-sample-output.py
Merge with brief branch manually