[PATCH 0/2] Followup for SPAN tests