Merge "Improve test_update_image_metadata testcase"