Tweaks for integration tests.