Fix json
Merge branch 'tests'