Merge "add image tests v2"