PP-20 + PP-21: more tests for the two new endpoints.