fixed failing xmatch tests