Better fix for fab itests