Sync itests with latest ag-ups master