More PHP 5.2 test fixes