added add_json branch to testing