Bug fix for integration tests.