84. Section 40 of the Act of 1987 is amended—

(a) by the substitution of “bodily samples” for “blood samples” wherever it appears, and

(b) in subsection (6) —

(i) in paragraph (a), by the substitution of “DNA tests” for “blood tests”, and

(ii) in paragraph (b), by the substitution of “DNA test” for “blood test”, and by the substitution of “bodily sample” for “blood sample”.