‘Surprise’ billing fix likely out of next Covid-19 package as fight over tests plays out