; and (ii) in subparagraph (B)— (I) in clause (i), by striking or at the end; (II) in clause (ii), by striking the period at the end and inserting a semicolon; and (III) by adding at the end the following: (iii) any public water system that is located in a State that does not participate in the voluntary grant program established under subparagraph (A) that— (I) assists schools or child care programs in lead testing; or (II) provides technical assistance to schools or child care programs in carrying out lead testing; or (iv) a qualified nonprofit organization, as determined by the Administrator. ; (B) in paragraphs (3), (5), (6), and (7), by striking State or local educational agency each place it appears and inserting State, local educational agency, public water system, tribal consortium, or qualified nonprofit organization ; (C) in paragraph (4), by striking States and local educational agencies and inserting States, local educational agencies, public water systems, tribal consortia, and qualified nonprofit organizations ; (D) in paragraph (6)— (i) in the matter preceding subparagraph (A), by inserting , public water system, tribal consortium, or qualified nonprofit organization after each local educational agency ; (ii) in subparagraph (A)(ii), by inserting or tribal after applicable State ; and (iii) in subparagraph (B)(i), by inserting applicable before local educational agency ; and (E) in paragraph (8), by striking 2020 and 2021 and inserting 2021 and 2022 . 12. Indian reservation drinking water program Section 2001 of the America's Water Infrastructure Act of 2018 (42 U.S.C. 300j–3c note; Public Law 115–270 ) is amended— (1) in subsection (a)— (A) in the matter preceding paragraph (1), by striking Subject to the availability of appropriations, the Administrator of the Environmental Protection Agency and inserting The Administrator of the Environmental Protection Agency (referred to in this section as the Administrator )