fixing jsonreport testing suite and minor fixes in jsonreport module
fixing indenting
Merge branches 'add_json' and 'master'