fix test_xmatch monkeypatching to use eso-ish methods