PF-22

- Add tests for PF-26