fix pe test
Update cherrypull
Update pf tests. Fix #1349 and use new pf separator