Some more tweaks to make the integration tests more stable.