Fixes to the integration tests.