Simplify code that converts found images to batches for rebuild
    
    Test of find_images_to_rebuild is also changed for this patch. Test
    data is redesigned.
    
    Signed-off-by: Chenxiong Qi <cqi@redhat.com>