test fix
Merge branch 't7_image'