Fixes in integration tests.