change: expect to xpect and updates