BS-10411 Fix integration tests