ENG-7207 changed format to json and added tests