Adjusted test part 1
Adjusted test part 2
Adjusted test part 3
Merge pull request #474 from kris-lab/issue-474

Make php5 tests more robust