Bug corrections in XPtest