avro changes + testing