FABRIC-617: Fix fab/fab-core itests