[saxon-upgrade] Ongoing development, 2 Tests left ...