Format: more tests
Format json, tests