prepare for avro test
Refactoring to allow addition of schema-based tests (for Avro, first)