Replace old test matrix P with Q.