Compat. Switch into next global function, compare normalized xml instead of strings in tests