Feature/json tests