Stabilize integration tests
7 files changed