Put the PR16167 tests together