Fixing some problems around integration tests.