White House, GOP agree to virus testing but aid bill shifts