Avro: more minor cleanups, and fix a test

Signed-off-by: Francis Galiegue <fgaliegue@gmail.com>