Merge branch 'hotfix/improve_output'

* hotfix/improve_output:
  Return an object json instead of a strinf for output. in pretty format
Support test and done some fixes
missing file
Merge branch 'hotfix/test_support' into develop

* hotfix/test_support:
  missing file
  Support test and done some fixes