Several test reqs updates, including for P2SH