Split Avro Test
Change to prevent null pointers exceptions