Multi-version PHP test fixes