backport other xml test changes to 1.12