PHP 5.2/5.3 test fixes