Improve/add json to tests