CRUNCH-417: Avro/Scrunch integration improvements and tests