Now AAAA records (if any) are added to additional records section for A query and A records (if any) are added to the additional section for AAAA query. Rearrange unit tests