Fix path to PHPT tests
Merge branch '3.8'