[WIP] Improve/add json to tests