Fix json files.
Revert cheat for avro files.
Most tests passing.