PHP 5.2 compatibility fixes for test suite