Merge "Adapt integration tests to use custom image config"