Update test fixtures
Scale back esschema.json to implement icrementalally