ALIEN-384 Fix IT tests (WIP)