Fix integration tests for new configuration