Fix multi-base-img testing bugs