Merge "Refactor compute image tests"