Merge "Image cleanup is missing in test_create_delete_image"