Merge "Change rebuild tests to use image_ref"