fix almost all p5 tests