Use more readable inline functions
better test cleanup

and even force the XFAIL to fail as it would take too long anyway, even if it passes
fix tests on linux
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix tests on linux
  better test cleanup
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix tests on linux
  better test cleanup