Improve (complete?) Avro schema

All test schemas from the Apache SVN now pass with that new schema.